forge
/
specs
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Move test.sh to bin/ and allow test_cli.sh to take absolute path to whck

This commit is contained in:
southerntofu 2022-02-21 15:02:01 +01:00
parent 9fca3d5736
commit d0570c1edb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test_cli.sh
View File

@ -29,10 +29,10 @@ if [ -z "$1" ]; then
# cli script needs to be executed to get absolute path to the program
export WHCK="$("$FIND_WHCK")"
else
if [ -x "$ORIGDIR"/"$1" ]; then
export WHCK="$(realpath "$ORIGDIR"/"$1")"
elif [ -x "$1" ]; then
if [ -f "$ORIGDIR"/"$1" ] && [ -x "$ORIGDIR"/"$1" ]; then
export WHCK="$(realpath "$ORIGDIR"/"$1")"
elif [ -f "$1" ] && [ -x "$1" ]; then
export WHCK="$(realpath "$1")"
else
echo "ERROR: Could not find provided validation program: "$1""
exit 2

6
test_tests_cli.sh
View File

@ -5,13 +5,13 @@
# TODO: save exit codes of various tests so we can know how many failed
function testVariousScenarios() {
echo "Running various tests from "$(pwd)""
./test.sh || echo "ERROR running from repo"
bin/test.sh || echo "ERROR running from repo"
cd spec
./test_cli.sh || echo "ERROR test_cli.sh failed with implicit ../cli"
./test_cli.sh "$(../bin/cli)" || echo "ERROR test_cli with explicit result from ../cli"
../test.sh || echo "ERROR test.sh failed called from spec submodule"
../bin/test.sh || echo "ERROR test.sh failed called from spec submodule"
cd tests
../../test.sh || echo "ERROR test.sh failed from spec/tests folder"
../../bin/test.sh || echo "ERROR test.sh failed from spec/tests folder"
../test_cli.sh || echo "ERROR test_cli.sh failed from spec/tests folder with implicit ../../cli"
../test_cli.sh "$(../../bin/cli)" || echo "ERROR test_cli.sh failed from spec/tests folder with explicit result from ../../cli"
}