CI Tests: Make sure the right binary gets tested

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

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)"

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"

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"

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"

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)}"