From b4b795697e786d352f8b10f27b03d10bd3582689 Mon Sep 17 00:00:00 2001
From: Martin Cermak <mcermak@redhat.com>
Date: Fri, 26 Jul 2024 12:14:22 +0200
Subject: [PATCH] CI Tests:  Make sure the right binary gets tested

---
 plans/ci.fmf                                                   | 3 ++-
 .../GNU-make-utility-v-3-82-shipped-with-el7-breaks/runtest.sh | 3 +++
 tests/Use-after-free-when-eval-in-variable/runtest.sh          | 3 +++
 tests/make-3-79-has-a-parsing-bug/runtest.sh                   | 3 +++
 tests/order-only/runtest.sh                                    | 3 +++
 tests/smoke-check-make-runs/runtest.sh                         | 3 +++
 6 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/plans/ci.fmf b/plans/ci.fmf
index 85710d6..4f781d4 100644
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@@ -1,6 +1,7 @@
 summary: CI Gating Plan
 discover:
     how: fmf
-    directory: tests
 execute:
     how: tmt
+environment+:
+    EXTRA_PATH: /opt/rh/make441/bin
diff --git a/tests/GNU-make-utility-v-3-82-shipped-with-el7-breaks/runtest.sh b/tests/GNU-make-utility-v-3-82-shipped-with-el7-breaks/runtest.sh
index a3c631c..4a9d134 100755
--- a/tests/GNU-make-utility-v-3-82-shipped-with-el7-breaks/runtest.sh
+++ b/tests/GNU-make-utility-v-3-82-shipped-with-el7-breaks/runtest.sh
@@ -28,6 +28,9 @@
 # Include Beaker environment
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
+# If EXTRA_PATH is set, prepend it to PATH
+export PATH=${EXTRA_PATH:+$EXTRA_PATH:}$PATH
+
 CMD="make"
 PACKAGE="make"
 BIN="$(which $CMD)"
diff --git a/tests/Use-after-free-when-eval-in-variable/runtest.sh b/tests/Use-after-free-when-eval-in-variable/runtest.sh
index dfc5e94..51d5a01 100755
--- a/tests/Use-after-free-when-eval-in-variable/runtest.sh
+++ b/tests/Use-after-free-when-eval-in-variable/runtest.sh
@@ -29,6 +29,9 @@
 # Include Beaker environment
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
+# If EXTRA_PATH is set, prepend it to PATH
+export PATH=${EXTRA_PATH:+$EXTRA_PATH:}$PATH
+
 CMD="make"
 BIN="$(which $CMD)"
 PACKAGE="make"
diff --git a/tests/make-3-79-has-a-parsing-bug/runtest.sh b/tests/make-3-79-has-a-parsing-bug/runtest.sh
index be60c1a..eb02b43 100755
--- a/tests/make-3-79-has-a-parsing-bug/runtest.sh
+++ b/tests/make-3-79-has-a-parsing-bug/runtest.sh
@@ -28,6 +28,9 @@
 # Include Beaker environment
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
+# If EXTRA_PATH is set, prepend it to PATH
+export PATH=${EXTRA_PATH:+$EXTRA_PATH:}$PATH
+
 CMD="make"
 BIN="$(which $CMD)"
 PACKAGE="make"
diff --git a/tests/order-only/runtest.sh b/tests/order-only/runtest.sh
index c355ea3..e5e28d2 100755
--- a/tests/order-only/runtest.sh
+++ b/tests/order-only/runtest.sh
@@ -28,6 +28,9 @@
 # Include Beaker environment
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
+# If EXTRA_PATH is set, prepend it to PATH
+export PATH=${EXTRA_PATH:+$EXTRA_PATH:}$PATH
+
 CMD="make"
 BIN="$(which $CMD)"
 PACKAGE="make"
diff --git a/tests/smoke-check-make-runs/runtest.sh b/tests/smoke-check-make-runs/runtest.sh
index 57e16d5..45344c3 100755
--- a/tests/smoke-check-make-runs/runtest.sh
+++ b/tests/smoke-check-make-runs/runtest.sh
@@ -28,6 +28,9 @@
 # Include Beaker environment
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
+# If EXTRA_PATH is set, prepend it to PATH
+export PATH=${EXTRA_PATH:+$EXTRA_PATH:}$PATH
+
 MAKE="$(which --skip-alias make)"
 PACKAGE="make"
 export PACKAGE="${PACKAGE:-$(rpm -qf --qf='%{name}\n' $MAKE)}"