Skip to content

Make extraction tests work without ${USER} (fixes #378) #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 11, 2025
Merged

Make extraction tests work without ${USER} (fixes #378) #383

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcd18e7
extract.sh: Use "grep -F" where possible
hartwork Jan 11, 2025
cd215f7
extract.sh: Set ${USER} when not set or empty in environment
hartwork Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions tests/lcov/extract/extract.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down