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

initial wish tests and testing mods to help

Browse Source
This commit is contained in:
Remzi Arpaci-Dusseau
2019-02-18 07:35:01 -05:00
parent 7f85361a23
commit 206a461d62
38 changed files with 78 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
processes-shell/tests/1.desc Normal file
View File

@@ -0,0 +1 @@
Input to check bad cd. No arguments are passed to cd.

1
processes-shell/tests/1.err Normal file
View File

@@ -0,0 +1 @@
An error has occurred

2
processes-shell/tests/1.in Normal file
View File

@@ -0,0 +1,2 @@
cd
exit

0
processes-shell/tests/1.out Normal file
View File

1
processes-shell/tests/1.rc Normal file
View File

@@ -0,0 +1 @@
0

1
processes-shell/tests/1.run Normal file
View File

@@ -0,0 +1 @@
./wish tests/1.in

1
processes-shell/tests/2.desc Normal file
View File

@@ -0,0 +1 @@
2 arguments are passed to cd.

1
processes-shell/tests/2.err Normal file
View File

@@ -0,0 +1 @@
An error has occurred

2
processes-shell/tests/2.in Normal file
View File

@@ -0,0 +1,2 @@
cd /bad1 /bad2
exit

0
processes-shell/tests/2.out Normal file
View File

1
processes-shell/tests/2.rc Normal file
View File

@@ -0,0 +1 @@
0

1
processes-shell/tests/2.run Normal file
View File

@@ -0,0 +1 @@
./wish tests/2.in

1
processes-shell/tests/3.desc Normal file
View File

@@ -0,0 +1 @@
ls with a bad directory name.

1
processes-shell/tests/3.err Normal file
View File

@@ -0,0 +1 @@
ls: /no/such/file: No such file or directory

2
processes-shell/tests/3.in Normal file
View File

@@ -0,0 +1,2 @@
ls /no/such/file
exit

0
processes-shell/tests/3.out Normal file
View File

1
processes-shell/tests/3.pre Normal file
View File

@@ -0,0 +1 @@
ls /no/such/file > tests/3.out 2> tests/3.err

1
processes-shell/tests/3.rc Normal file
View File

@@ -0,0 +1 @@
0

1
processes-shell/tests/3.run Normal file
View File

@@ -0,0 +1 @@
./wish tests/3.in

1
processes-shell/tests/4.desc Normal file
View File

@@ -0,0 +1 @@
Input to run misc. commands.

0
processes-shell/tests/4.err Normal file
View File

2
processes-shell/tests/4.in Normal file
View File

@@ -0,0 +1,2 @@
cd tests/p2a-test
ls

4
processes-shell/tests/4.out Normal file
View File

@@ -0,0 +1,4 @@
test1
test2
test3
test4

1
processes-shell/tests/4.rc Normal file
View File

@@ -0,0 +1 @@
0

1
processes-shell/tests/4.run Normal file
View File

@@ -0,0 +1 @@
./wish tests/4.in

1
processes-shell/tests/5.desc Normal file
View File

@@ -0,0 +1 @@
Tries to exit with an argument. Should throw an error.

1
processes-shell/tests/5.err Normal file
View File

@@ -0,0 +1 @@
An error has occurred

2
processes-shell/tests/5.in Normal file
View File

@@ -0,0 +1,2 @@
exit bad
exit

0
processes-shell/tests/5.out Normal file
View File

1
processes-shell/tests/5.rc Normal file
View File

@@ -0,0 +1 @@
0

1
processes-shell/tests/5.run Normal file
View File

@@ -0,0 +1 @@
./wish tests/5.in

1
processes-shell/tests/6.desc Normal file
View File

@@ -0,0 +1 @@
Try running a shell script without setting path.

1
processes-shell/tests/6.err Normal file
View File

@@ -0,0 +1 @@
An error has occurred

2
processes-shell/tests/6.in Normal file
View File

@@ -0,0 +1,2 @@
p1.sh
exit

0
processes-shell/tests/6.out Normal file
View File

1
processes-shell/tests/6.rc Normal file
View File

@@ -0,0 +1 @@
0

1
processes-shell/tests/6.run Normal file
View File

@@ -0,0 +1 @@
./wish tests/6.in

62
tester/run-tests.sh
View File

@@ -1,9 +1,14 @@
#! /usr/bin/env bash #! /usr/bin/env bash
# run_test testnumber # run_test testdir testnumber
run_test () { run_test () {
local testnum=$1 local testdir=$1
local testfile=tests/$testnum.run local testnum=$2
local prefile=$testdir/$testnum.pre
if [[ -f $prefile ]]; then
eval $(cat $prefile)
fi
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
} }
@@ -12,22 +17,24 @@ print_error_message () {
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: standard $filetype incorrect\e[0m"
echo " what results should be found in file: tests/$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" echo " compare the two using diff, cmp, or related tools to debug, e.g.:"
echo " prompt> diff $testdir/$testnum.$filetype tests-out/$testnum.$filetype"
if (( $contrunning == 0 )); then if (( $contrunning == 0 )); then
exit 1 exit 1
fi fi
} }
# check_test testnumber contrunning out/err # check_test testdir testnumber contrunning out/err
check_test () { check_test () {
local testnum=$1 local testdir=$1
local contrunning=$2 local testnum=$2
local filetype=$3 local contrunning=$3
local filetype=$4
# option to use cmp instead? # option to use cmp instead?
returnval=$(diff tests/$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 -n 1
else else
@@ -35,16 +42,17 @@ check_test () {
fi fi
} }
# run_and_check testnumber contrunning verbose printerror # run_and_check testdir testnumber contrunning verbose printerror
# testnumber: the test to run and check # testnumber: the test to run and check
# printerrer: if 1, print an error if test does not exist # printerrer: if 1, print an error if test does not exist
run_and_check () { run_and_check () {
local testnum=$1 local testdir=$1
local contrunning=$2 local testnum=$2
local verbose=$3 local contrunning=$3
local failmode=$4 local verbose=$4
local failmode=$5
if [[ ! -f tests/$testnum.run ]]; then if [[ ! -f $testdir/$testnum.run ]]; then
if (( $failmode == 1 )); then if (( $failmode == 1 )); then
echo "test $testnum does not exist" >&2; exit 1 echo "test $testnum does not exist" >&2; exit 1
fi fi
@@ -52,11 +60,11 @@ run_and_check () {
fi fi
if (( $verbose == 1 )); then if (( $verbose == 1 )); then
echo "running test $testnum" echo "running test $testnum"
cat tests/$testnum.desc cat $testdir/$testnum.desc
fi fi
run_test $testnum run_test $testdir $testnum
outcheck=$(check_test $testnum $contrunning out) outcheck=$(check_test $testdir $testnum $contrunning out)
errcheck=$(check_test $testnum $contrunning err) errcheck=$(check_test $testdir $testnum $contrunning err)
# echo "results: outcheck:$outcheck errcheck:$errcheck" # echo "results: outcheck:$outcheck errcheck:$errcheck"
if (( $outcheck == 0 )) && (( $errcheck == 0 )); then if (( $outcheck == 0 )) && (( $errcheck == 0 )); then
builtin echo -e "\e[32mtest $testnum: passed\e[0m" builtin echo -e "\e[32mtest $testnum: passed\e[0m"
@@ -72,11 +80,12 @@ run_and_check () {
# usage: call when args not parsed, or when help needed # usage: call when args not parsed, or when help needed
usage () { usage () {
echo "usage: run-tests.sh [-h] [-v] [-t test] [-c]" echo "usage: run-tests.sh [-h] [-v] [-t test] [-c] [-d testdir]"
echo " -h help message" echo " -h help message"
echo " -v verbose" echo " -v verbose"
echo " -t n run only test n" echo " -t n run only test n"
echo " -c continue even after failure" echo " -c continue even after failure"
echo " -d testdir run tests from testdir"
return 0 return 0
} }
@@ -84,10 +93,11 @@ usage () {
# main program # main program
# #
verbose=0 verbose=0
testdir="tests"
contrunning=0 contrunning=0
specific="" specific=""
args=`getopt hvct: $*` args=`getopt hvct:d: $*`
if [[ $? != 0 ]]; then if [[ $? != 0 ]]; then
usage; exit 1 usage; exit 1
fi fi
@@ -114,6 +124,10 @@ for i; do
echo "-t must be followed by a number" >&2; exit 1 echo "-t must be followed by a number" >&2; exit 1
fi fi
shift;; shift;;
-d)
testdir=$2
shift
shift;;
--) --)
shift; break;; shift; break;;
esac esac
@@ -126,14 +140,14 @@ fi
# run just one test # run just one test
if [[ $specific != "" ]]; then if [[ $specific != "" ]]; then
run_and_check $specific $contrunning $verbose 1 run_and_check $testdir $specific $contrunning $verbose 1
exit 0 exit 0
fi fi
# run all tests # run all tests
(( testnum = 1 )) (( testnum = 1 ))
while true; do while true; do
run_and_check $testnum $contrunning $verbose 0 run_and_check $testdir $testnum $contrunning $verbose 0
(( testnum = $testnum + 1 )) (( testnum = $testnum + 1 ))
done done