nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-22 06:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10650 from fricklerhandwerk/simplify-shell-tests

Browse Source 
tests: remove unneeded indirection
This commit is contained in:
John Ericson 2024-05-06 10:24:45 -04:00 committed by GitHub
commit ea70878a76
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mk/common-test.sh
View File

@ -17,11 +17,3 @@ TESTS_ENVIRONMENT=(
run () {
cd "$(dirname $1)" && env "${TESTS_ENVIRONMENT[@]}" $BASH -x -e -u -o pipefail $(basename $1)
}
init_test () {
run "$init" 2>/dev/null > /dev/null
}
run_test_proper () {
run "$test"
}

4
mk/debug-test.sh
View File

@ -9,6 +9,6 @@ dir="$(dirname "${BASH_SOURCE[0]}")"
source "$dir/common-test.sh"
if [ -n "$init" ]; then
(init_test)
(run "$init" 2>/dev/null > /dev/null)
fi
run_test_proper
run "$test"

4
mk/run-test.sh
View File

@ -23,9 +23,9 @@ fi
run_test () {
if [ -n "$init" ]; then
(init_test 2>/dev/null > /dev/null)
(run "$init" 2>/dev/null > /dev/null)
fi
log="$(run_test_proper 2>&1)" && status=0 || status=$?
log="$(run "$test" 2>&1)" && status=0 || status=$?
}
run_test