lostecho/ostep-projects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tester with some new features

Browse Source
This commit is contained in:
Remzi Arpaci-Dusseau
2019-02-22 03:49:22 -06:00
parent 43041b2814
commit 359228058c
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tester/run-tests.sh
View File

@@ -1,4 +1,4 @@
#! /usr/bin/env bash #! /usr/bin/env bash
# run_test testdir testnumber # run_test testdir testnumber
run_test () { run_test () {
@@ -10,13 +10,15 @@ run_test () {
fi fi
local testfile=$testdir/$testnum.run local testfile=$testdir/$testnum.run
eval $(cat $testfile) > tests-out/$testnum.out 2> tests-out/$testnum.err eval $(cat $testfile) > tests-out/$testnum.out 2> tests-out/$testnum.err
echo $? > tests-out/$testnum.rc
return
} }
print_error_message () { print_error_message () {
local testnum=$1 local testnum=$1
local contrunning=$2 local contrunning=$2
local filetype=$3 local filetype=$3
builtin echo -e "\e[31mtest $testnum: standard $filetype incorrect\e[0m" builtin echo -e "\e[31mtest $testnum: $filetype incorrect\e[0m"
echo " what results should be found in file: $testdir/$testnum.$filetype" echo " what results should be found in file: $testdir/$testnum.$filetype"
echo " what results produced by your program: tests-out/$testnum.$filetype" echo " what results produced by your program: tests-out/$testnum.$filetype"
echo " compare the two using diff, cmp, or related tools to debug, e.g.:" echo " compare the two using diff, cmp, or related tools to debug, e.g.:"
@@ -35,10 +37,10 @@ check_test () {
# option to use cmp instead? # option to use cmp instead?
returnval=$(diff $testdir/$testnum.$filetype tests-out/$testnum.$filetype) returnval=$(diff $testdir/$testnum.$filetype tests-out/$testnum.$filetype)
if (( $? != 0 )); then if (( $? == 0 )); then
echo -n 1 echo 0
else else
echo -n 0 echo 1
fi fi
} }
@@ -63,18 +65,29 @@ run_and_check () {
cat $testdir/$testnum.desc cat $testdir/$testnum.desc
fi fi
run_test $testdir $testnum run_test $testdir $testnum
rccheck=$(check_test $testdir $testnum $contrunning rc)
outcheck=$(check_test $testdir $testnum $contrunning out) outcheck=$(check_test $testdir $testnum $contrunning out)
errcheck=$(check_test $testdir $testnum $contrunning err) errcheck=$(check_test $testdir $testnum $contrunning err)
othercheck=0
if [[ -f $testdir/$testnum.other ]]; then
othercheck=$(check_test $testdir $testnum $contrunning other)
fi
# echo "results: outcheck:$outcheck errcheck:$errcheck" # echo "results: outcheck:$outcheck errcheck:$errcheck"
if (( $outcheck == 0 )) && (( $errcheck == 0 )); then if (( $rccheck == 0 )) && (( $outcheck == 0 )) && (( $errcheck == 0 )) && (( $othercheck == 0 )); then
builtin echo -e "\e[32mtest $testnum: passed\e[0m" builtin echo -e "\e[32mtest $testnum: passed\e[0m"
else else
if (( $rccheck == 1 )); then
print_error_message $testnum $contrunning rc
fi
if (( $outcheck == 1 )); then if (( $outcheck == 1 )); then
print_error_message $testnum $contrunning out print_error_message $testnum $contrunning out
fi fi
if (( $errcheck == 1 )); then if (( $errcheck == 1 )); then
print_error_message $testnum $contrunning err print_error_message $testnum $contrunning err
fi fi
if (( $othercheck == 1 )); then
print_error_message $testnum $contrunning other
fi
fi fi
} }