Skip to content

Commit 58dcd1c

Browse files
committed
test: Use log files for gcovr output, redirect docker cp output to /dev/null
This is necessary because `podman cp` doesn't know `-q` flag
1 parent d208db1 commit 58dcd1c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

test/includes/common.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ run_test() {
4242
# preserve the coverage files
4343
# docker has problems with names containing spaces
4444
f=$(echo ${2:-1} | sed 's/ /-/g')
45-
docker exec ${httpd_cont} sh -c "cd /native; gcovr --gcov-ignore-errors=no_working_dir_found --json /coverage/coverage-$f.json"
45+
docker exec ${httpd_cont} sh -c "cd /native; gcovr --gcov-ignore-errors=no_working_dir_found --json /coverage/coverage-$f.json > /coverage/coverage-$f.log 2>&1"
4646

4747
for f in $(docker exec ${httpd_cont} ls /coverage/); do
48-
docker cp -q ${httpd_cont}:/coverage/$f $PWD/coverage/$f
48+
docker cp ${httpd_cont}:/coverage/$f $PWD/coverage/$f > /dev/null
4949
done
5050
fi
5151

test/testsuite.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,11 @@ if [ $CODE_COVERAGE ]; then
131131
docker exec $MPC_NAME /usr/local/apache2/bin/apachectl stop
132132

133133
for f in $(ls coverage/*.json); do
134-
docker cp -q $f $MPC_NAME:/coverage/
134+
docker cp $f $MPC_NAME:/coverage/ > /dev/null
135135
done
136136

137-
docker exec $MPC_NAME sh -c 'cd /native; gcovr --add-tracefile "/coverage/coverage-*.json" --html-details /coverage/test-coverage.html'
138-
docker cp $MPC_NAME:/coverage/ .
137+
docker exec $MPC_NAME sh -c 'cd /native; gcovr --add-tracefile "/coverage/coverage-*.json" --html-details /coverage/test-coverage.html > /coverage/test-coverage.log 2>&1'
138+
docker cp $MPC_NAME:/coverage/ . > /dev/null
139139

140140
httpd_remove
141141
fi

0 commit comments

Comments
 (0)