diff --git a/checker/checker.sh b/checker/checker.sh index a8ff6a244c054091455f5b56a2605158a9349be4..53052e2dc7bdd973ff1ce3812f3023e990d389ca 100755 --- a/checker/checker.sh +++ b/checker/checker.sh @@ -5,13 +5,7 @@ rm -fr ../tests/ cp -r "$CHECKER_DATA_DIRECTORY"/../tests .. -# Everything happens in the tests/ directory. +# Checking and grading happens in the tests/ directory. pushd ../tests > /dev/null || exit 1 - -echo -e "\n\n### RUNING CHECKER\n\n" -make check - -echo -e "\n\n### RUNING LINTER\n\n" -make lint - +./grade.sh popd > /dev/null || exit 1 diff --git a/tests/run_all.sh b/tests/run_all.sh index f4746c3f441c6b0ac3a2654e2fa3c3b34fced3f9..609f9bd3a721e97f8fa107a36b2af241d00c696a 100755 --- a/tests/run_all.sh +++ b/tests/run_all.sh @@ -7,7 +7,7 @@ script=./_test/run_test.sh exec_name="mini-shell" if test -z "$SRC_PATH"; then - SRC_PATH=$(pwd)/../src + SRC_PATH=$(pwd)/../src fi ln -fn "$SRC_PATH"/"$exec_name" . @@ -18,7 +18,7 @@ bash "$script" init # bash "$script" check. for i in $(seq $first_test $last_test); do - bash "$script" "$i" + bash "$script" "$i" done | tee results.txt grep -a '\[.*\]$' results.txt | awk -F '[] /[]+' ' @@ -31,7 +31,7 @@ BEGIN { } END { - printf "\n%66s %3d/100\n", "Total:", sum; + printf "\n%s %3d/100\n", "Total:", sum; }' # Cleanup testing environment.