aports/main/audit/fix-tests.patch
2025-07-13 05:39:15 +00:00

51 lines
2.0 KiB
Diff

Patch-Source-1: https://github.com/linux-audit/audit-userspace/commit/d62d9c6c0206da529ef04bfa4cd7086343d39f71
Patch-Source-2: https://github.com/linux-audit/audit-userspace/commit/275e36aac67a7cdeeeb14a0b982f15f8041673b7
--
From d62d9c6c0206da529ef04bfa4cd7086343d39f71 Mon Sep 17 00:00:00 2001
From: Steve Grubb <ausearch.1@gmail.com>
Date: Fri, 11 Jul 2025 20:05:32 -0400
Subject: [PATCH 1/2] Fix Variable used as literral in
run_auparselol_test.sh.in
---
auparse/test/run_auparselol_test.sh.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/auparse/test/run_auparselol_test.sh.in b/auparse/test/run_auparselol_test.sh.in
index d0208da50..a20cc3c11 100755
--- a/auparse/test/run_auparselol_test.sh.in
+++ b/auparse/test/run_auparselol_test.sh.in
@@ -2,6 +2,6 @@
set -e
srcdir="@srcdir@"
-./auparselol_test -f "srcdir"/test3.log --check | sort > auparse_test.cur
-sed -f "$srcdir"/auditd_raw.sed "srcdir"/test3.log | sort > auparse_test.raw
+./auparselol_test -f "$srcdir"/test3.log --check | sort > auparse_test.cur
+sed -f "$srcdir"/auditd_raw.sed "$srcdir"/test3.log | sort > auparse_test.raw
diff -u auparse_test.raw auparse_test.cur
--
From 275e36aac67a7cdeeeb14a0b982f15f8041673b7 Mon Sep 17 00:00:00 2001
From: Steve Grubb <ausearch.1@gmail.com>
Date: Sat, 12 Jul 2025 09:04:38 -0400
Subject: [PATCH 2/2] No parallel test execution in auparse
The tests all have the same output file that gets comared
top a standard value. If executed in parallel, the overwrite
the values and tests fail. For now, just disallow parallel
execution of auparse tests.
---
auparse/test/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
diff --git a/auparse/test/Makefile.am b/auparse/test/Makefile.am
index ffc4169a3..ce74a2ac3 100644
--- a/auparse/test/Makefile.am
+++ b/auparse/test/Makefile.am
@@ -111,3 +111,5 @@ if USE_PYTHON3
$(RM) ${top_builddir}/bindings/swig/python3/_audit.so
endif
test "$(top_srcdir)" = "$(top_builddir)" || $(RM) test*.log
+
+.NOTPARALLEL: