Fix: Add TEST_PROJECT injected var to make-unit

This was missed in the last commit, when make-unit.sh was modified so that it could be set to something that isn't the triggering gerrit project. This commit also improves the feedback from make-unit.sh if the Makefile isn't found. Signed-off-by: Eric Ball <[email protected]> Change-Id: I12b78b94edffb1a80e462450cc2e5b8883e10de2
opencord · Oct 31, 2024 · fdfc3ec · fdfc3ec
1 parent 43254c1
commit fdfc3ec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/jjb/make-unit.yaml b/jjb/make-unit.yaml
@@ -48,6 +48,7 @@
             UNIT_TEST_TARGETS={unit-test-targets}
             UNIT_TEST_KEEP_GOING={unit-test-keep-going}
             GOPROXY=https://proxy.golang.org
+            TEST_PROJECT={project}
       - shell: !include-raw-escape: shell/make-unit.sh
 
     publishers:

diff --git a/jjb/shell/make-unit.sh b/jjb/shell/make-unit.sh
@@ -47,7 +47,7 @@ UNIT_TEST_TARGETS=${UNIT_TEST_TARGETS:-test}
 UNIT_TEST_KEEP_GOING=${UNIT_TEST_KEEP_GOING:-false}
 
 if [ ! -f "$test_path/Makefile" ]; then
-  echo "Makefile not found at $test_path!"
+  echo "Makefile not found at ${test_path}/Makefile"
   exit 1
 else
   pushd "$test_path"