From e715eaaf417cc73ab45b35a3bb132ed19347394d Mon Sep 17 00:00:00 2001
From: Aleksey Nikitin <imsouz9@gmail.com>
Date: Wed, 1 Feb 2023 11:59:21 +0300
Subject: [PATCH] auditd: refactor testing inside docker

---
 auditd/1.0.0/Makefile                        | 8 ++++----
 auditd/1.0.0/cmodule/managed_spec.lua        | 6 ++----
 auditd/1.0.0/docker/Dockerfile.debian-10     | 2 +-
 auditd/1.0.0/docker/Dockerfile.debian-11     | 2 +-
 auditd/1.0.0/docker/Dockerfile.oraclelinux-8 | 2 +-
 auditd/1.0.0/docker/Dockerfile.ubuntu-20.04  | 2 +-
 auditd/1.0.0/docker/Dockerfile.ubuntu-22.04  | 2 +-
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/auditd/1.0.0/Makefile b/auditd/1.0.0/Makefile
index 3af3e2f..5edc60d 100644
--- a/auditd/1.0.0/Makefile
+++ b/auditd/1.0.0/Makefile
@@ -1,5 +1,5 @@
 test:
-	$(SOLDR_MODULES)/bin/busted --exclude-tags=root $(BUSTED_FLAGS) .
+	$(SOLDR_MODULES)/bin/busted $(BUSTED_FLAGS) .
 
 OS_LIST := $(subst docker/Dockerfile.,,$(wildcard docker/Dockerfile.*))
 test-inside-all: $(OS_LIST:%=test-inside-%)
@@ -8,6 +8,6 @@ test-inside-%: docker/Dockerfile.%
 	@echo === $* ===
 	@docker build -t test/$* -f docker/Dockerfile.$* . >&-
 	@docker run --rm \
-		-e SOLDR_MODULES=/src \
-		-v $(SOLDR_MODULES):/src:ro -w /src/auditd/1.0.0 \
-		test/$* /src/bin/busted $(BUSTED_FLAGS) .
+		-e SOLDR_MODULES=/src -e BUSTED_FLAGS \
+		-v $(SOLDR_MODULES):/src:ro \
+		test/$* make test -sC /src/auditd/1.0.0
diff --git a/auditd/1.0.0/cmodule/managed_spec.lua b/auditd/1.0.0/cmodule/managed_spec.lua
index 8d25c74..8ba9e45 100644
--- a/auditd/1.0.0/cmodule/managed_spec.lua
+++ b/auditd/1.0.0/cmodule/managed_spec.lua
@@ -2,7 +2,7 @@ local managed = require "managed"
 local exec = require "exec"
 
 local function rm(path)
-	local cmd = string.format("rm -r %q", path)
+	local cmd = string.format("rm -rf %q", path)
 	assert(exec(cmd))
 end
 
@@ -22,9 +22,7 @@ describe("Managed file #write", function()
 		tmp = assert(exec("mktemp -d"))
 		f_name = tmp .. "/sub/file"
 	end)
-	teardown(function()
-		rm(tmp)
-	end)
+	teardown(function() rm(tmp) end)
 
 	describe("ensure()", function()
 		it("should create a file unless it exists", function()
diff --git a/auditd/1.0.0/docker/Dockerfile.debian-10 b/auditd/1.0.0/docker/Dockerfile.debian-10
index 8cdf25d..7b4f5f3 100644
--- a/auditd/1.0.0/docker/Dockerfile.debian-10
+++ b/auditd/1.0.0/docker/Dockerfile.debian-10
@@ -1,4 +1,4 @@
 FROM debian:10
 RUN apt-get update;
-RUN apt-get install --yes systemd;
+RUN apt-get install --yes systemd make;
 RUN apt-get install --yes --download-only auditd;
diff --git a/auditd/1.0.0/docker/Dockerfile.debian-11 b/auditd/1.0.0/docker/Dockerfile.debian-11
index b0c473e..a598b34 100644
--- a/auditd/1.0.0/docker/Dockerfile.debian-11
+++ b/auditd/1.0.0/docker/Dockerfile.debian-11
@@ -1,4 +1,4 @@
 FROM debian:11
 RUN apt-get update;
-RUN apt-get install --yes systemd;
+RUN apt-get install --yes systemd make;
 RUN apt-get install --yes --download-only auditd;
diff --git a/auditd/1.0.0/docker/Dockerfile.oraclelinux-8 b/auditd/1.0.0/docker/Dockerfile.oraclelinux-8
index 4ac7f04..07be265 100644
--- a/auditd/1.0.0/docker/Dockerfile.oraclelinux-8
+++ b/auditd/1.0.0/docker/Dockerfile.oraclelinux-8
@@ -1,3 +1,3 @@
 FROM oraclelinux:8
-RUN dnf makecache;
+RUN dnf install -y make;
 RUN dnf install -y --downloadonly audit;
diff --git a/auditd/1.0.0/docker/Dockerfile.ubuntu-20.04 b/auditd/1.0.0/docker/Dockerfile.ubuntu-20.04
index 792f6a0..f79c327 100644
--- a/auditd/1.0.0/docker/Dockerfile.ubuntu-20.04
+++ b/auditd/1.0.0/docker/Dockerfile.ubuntu-20.04
@@ -1,4 +1,4 @@
 FROM ubuntu:20.04
 RUN apt-get update;
-RUN apt-get install --yes systemd;
+RUN apt-get install --yes systemd make;
 RUN apt-get install --yes --download-only auditd;
diff --git a/auditd/1.0.0/docker/Dockerfile.ubuntu-22.04 b/auditd/1.0.0/docker/Dockerfile.ubuntu-22.04
index e35c18c..bf727e5 100644
--- a/auditd/1.0.0/docker/Dockerfile.ubuntu-22.04
+++ b/auditd/1.0.0/docker/Dockerfile.ubuntu-22.04
@@ -1,4 +1,4 @@
 FROM ubuntu:22.04
 RUN apt-get update;
-RUN apt-get install --yes systemd;
+RUN apt-get install --yes systemd make;
 RUN apt-get install --yes --download-only auditd;