FIX little fixes in makefile and testHarness.sh

telefonicaid · Sep 5, 2023 · 0f45fe8 · 0f45fe8
1 parent b65186d
commit 0f45fe8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/makefile b/makefile
@@ -234,6 +234,7 @@ ftd: functional_test_debug
 test: unit_test functional_test
 
 coverage: install_coverage
+	# FIXME #4418: the functional test part of this target is not working properly. Check issue for details.
 	# Init coverage
 	echo "Initializing coverage files"
 	mkdir -p coverage
@@ -291,6 +292,7 @@ coverage_unit_test: build_unit_test
 	genhtml -o coverage coverage/broker.info
 
 coverage_functional_test: install_coverage
+	# FIXME #4418: this target is not working properly. Check issue for details.
 	# Init coverage
 	echo "Initializing coverage files"
 	mkdir -p coverage

diff --git a/test/functionalTest/testHarness.sh b/test/functionalTest/testHarness.sh
@@ -914,7 +914,8 @@ function testDisabled
   dIx=0
   while [ $dIx -lt  ${#DISABLED[@]} ]
   do
-    if [ test/functionalTest/cases/$testcase == ${DISABLED[$dIx]} ]
+    # Comparison is done based in filename, skipping the path (see https://stackdiary.com/tutorials/bash-get-filename-from-path/)
+    if [ "${testcase##*/}" == "${DISABLED[$dIx]##*/}" ]
     then
       echo "Disabled"