Make extraction tests work without ${USER} (fixes linux-test-projec…

…t#378) (linux-test-project#383) * extract.sh: Use "grep -F" where possible * extract.sh: Set ${USER} when not set or empty in environment Signed-off-by: Sebastian Pipping <[email protected]>
henry2cox · Jan 11, 2025 · f53848b · f53848b
1 parent 54ce5db
commit f53848b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/tests/lcov/extract/extract.sh b/tests/lcov/extract/extract.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set +x
 
+: ${USER:="$(id -u -n)"}
+
 source ../../common.tst
 
 rm -rf *.gcda *.gcno a.out *.info* *.txt* *.json dumper* testRC *.gcov *.gcov.* *.log *.o errs *.msg *.dat
@@ -217,7 +219,7 @@ if [ 0 != $? ] ; then
     fi
 fi
 
-grep -E "\"user\":\"$USER\"" context.info.json
+grep -F "\"user\":\"$USER\"" context.info.json
 if [ 0 != $? ] ; then
     echo "Error:  did not find expected context field"
     if [ $KEEP_GOING == 0 ] ; then
@@ -241,7 +243,7 @@ if [ 0 != $? ] ; then
     fi
 fi
 
-grep -E "\"user\":\"$USER\"" context.info.json
+grep -F "\"user\":\"$USER\"" context.info.json
 if [ 0 != $? ] ; then
     echo "Error:  did not find expected context field"
     if [ $KEEP_GOING == 0 ] ; then