From 2b535c74ad5a25ecd66d550ec326f4d1add120f4 Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu, 6 Jun 2024 18:02:29 +0100
Subject: [PATCH] tests: omit possibly set CC/LD/OBJDUMP flags

The chances of failure when the flags are set is reasonably small
(famous last words), so omit them. This allows us to handle any
variation without adding heaps of extra code.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---
 run_test.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/run_test.sh b/run_test.sh
index fe82a7bd..796aecde 100755
--- a/run_test.sh
+++ b/run_test.sh
@@ -195,6 +195,9 @@ generalize_expected_output() {
     # Apport related error that can occur in the CI. Drop from the output to be more generic
     sed -i "/^python3: can't open file '\/usr\/share\/apport\/package-hooks\/dkms_packages.py'\: \[Errno 2\] No such file or directory$/d" ${output_log}
     sed -i "/^ERROR (dkms apport): /d" ${output_log}
+
+    # Swap any CC/LD/OBJDUMP flags (if set) with a placeholder message
+    sed -i "s/i\(make -j1 KERNELRELEASE=${KERNEL_VER} all\).*/\1 <omitting possibly set CC/LD/OBJDUMP flags>/" ${output_log}
 }
 
 run_with_expected_output() {
@@ -1425,7 +1428,7 @@ Building module:
 Cleaning build area...
 Building module(s)...(bad exit status: 2)
 Failed command:
-make -j1 KERNELRELEASE=${KERNEL_VER} all
+make -j1 KERNELRELEASE=${KERNEL_VER} all <omitting possibly set CC/LD/OBJDUMP flags>
 Error! Bad return status for module build on kernel: ${KERNEL_VER} (${KERNEL_ARCH})
 Consult /var/lib/dkms/dkms_failing_test/1.0/build/make.log for more information.
 dkms autoinstall on ${KERNEL_VER}/${KERNEL_ARCH} failed for dkms_failing_test(10)
@@ -1444,7 +1447,7 @@ Building module:
 Cleaning build area...
 Building module(s)...(bad exit status: 2)
 Failed command:
-make -j1 KERNELRELEASE=${KERNEL_VER} all
+make -j1 KERNELRELEASE=${KERNEL_VER} all <omitting possibly set CC/LD/OBJDUMP flags>
 Error! Bad return status for module build on kernel: ${KERNEL_VER} (${KERNEL_ARCH})
 Consult /var/lib/dkms/dkms_failing_test/1.0/build/make.log for more information.
 dkms autoinstall on ${KERNEL_VER}/${KERNEL_ARCH} failed for dkms_failing_test(10)
@@ -1593,7 +1596,7 @@ Building module:
 Cleaning build area...
 Building module(s)...(bad exit status: 2)
 Failed command:
-make -j1 KERNELRELEASE=${KERNEL_VER} all
+make -j1 KERNELRELEASE=${KERNEL_VER} all <omitting possibly set CC/LD/OBJDUMP flags>
 Error! Bad return status for module build on kernel: ${KERNEL_VER} (${KERNEL_ARCH})
 Consult /var/lib/dkms/dkms_failing_test/1.0/build/make.log for more information.