wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-24 22:11:15 +02:00
Code Activity

tests/functional/characterisation/framework: Log to stderr

Browse source 
It seems that `meson test --print-errorlogs` only captures stderr,
so this makes it forward the logs as intended.

We might want to redirect stdout in our common setup script instead.
This commit is contained in:
Robert Hensing 2025-01-24 16:39:56 +01:00
parent fbe2940a08
commit a5de2dd274
1 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

42
tests/functional/characterisation/framework.sh
View file

@ -1,5 +1,7 @@
# shellcheck shell=bash # shellcheck shell=bash
badTestNames=()
# Golden test support # Golden test support
# #
# Test that the output of the given test matches what is expected. If # Test that the output of the given test matches what is expected. If
@ -18,10 +20,11 @@ function diffAndAcceptInner() {
fi fi
# Diff so we get a nice message # Diff so we get a nice message
if ! diff --color=always --unified "$expectedOrEmpty" "$got"; then if ! diff >&2 --color=always --unified "$expectedOrEmpty" "$got"; then
echo "FAIL: evaluation result of $testName not as expected" echo >&2 "FAIL: evaluation result of $testName not as expected"
# shellcheck disable=SC2034 # shellcheck disable=SC2034
badDiff=1 badDiff=1
badTestNames+=("$testName")
fi fi
# Update expected if `_NIX_TEST_ACCEPT` is non-empty. # Update expected if `_NIX_TEST_ACCEPT` is non-empty.
@ -42,14 +45,14 @@ function characterisationTestExit() {
if test -n "${_NIX_TEST_ACCEPT-}"; then if test -n "${_NIX_TEST_ACCEPT-}"; then
if (( "$badDiff" )); then if (( "$badDiff" )); then
set +x set +x
echo 'Output did mot match, but accepted output as the persisted expected output.' echo >&2 'Output did mot match, but accepted output as the persisted expected output.'
echo 'That means the next time the tests are run, they should pass.' echo >&2 'That means the next time the tests are run, they should pass.'
set -x set -x
else else
set +x set +x
echo 'NOTE: Environment variable _NIX_TEST_ACCEPT is defined,' echo >&2 'NOTE: Environment variable _NIX_TEST_ACCEPT is defined,'
echo 'indicating the unexpected output should be accepted as the expected output going forward,' echo >&2 'indicating the unexpected output should be accepted as the expected output going forward,'
echo 'but no tests had unexpected output so there was no expected output to update.' echo >&2 'but no tests had unexpected output so there was no expected output to update.'
set -x set -x
fi fi
if (( "$badExitCode" )); then if (( "$badExitCode" )); then
@ -60,16 +63,21 @@ function characterisationTestExit() {
else else
if (( "$badDiff" )); then if (( "$badDiff" )); then
set +x set +x
echo '' echo >&2 ''
echo 'You can rerun this test with:' echo >&2 'The following tests had unexpected output:'
echo '' for testName in "${badTestNames[@]}"; do
echo " _NIX_TEST_ACCEPT=1 make tests/functional/${TEST_NAME}.sh.test" echo >&2 " $testName"
echo '' done
echo 'to regenerate the files containing the expected output,' echo >&2 ''
echo 'and then view the git diff to decide whether a change is' echo >&2 'You can rerun this test with:'
echo 'good/intentional or bad/unintentional.' echo >&2 ''
echo 'If the diff contains arbitrary or impure information,' echo >&2 " _NIX_TEST_ACCEPT=1 meson test ${TEST_NAME}"
echo 'please improve the normalization that the test applies to the output.' echo >&2 ''
echo >&2 'to regenerate the files containing the expected output,'
echo >&2 'and then view the git diff to decide whether a change is'
echo >&2 'good/intentional or bad/unintentional.'
echo >&2 'If the diff contains arbitrary or impure information,'
echo >&2 'please improve the normalization that the test applies to the output.'
set -x set -x
fi fi
exit $(( "$badExitCode" + "$badDiff" )) exit $(( "$badExitCode" + "$badDiff" ))