Updated tests

Former-commit-id: 3f567e6da96fba0d4cb71c0ded10a158e168d0fb

tests/coreutils/bzip2_manual_tests.sh

 #!/bin/sh
 
 echo "hello" > inputfile1
-cp `which ls` > ls.orig
+cp `which ls` ls.orig
 bzip2 -k -c ls.orig > ls.orig.bz2
 
-# should really be of the form
-#$PEASOUP_HOME/tools/manual_test_import.sh --cmd "./BZIP2 -k -1 inputfile1 -c > outputfile1 2> err" --prog BZIP2=`which bzip2` --infile inputfile1=inputfile1 --outfile outputfile1=outfile1 --outfile err --name bzip2.k1
+# test small memory footprint option
+bzip2 -k -s -c ls.orig > ls.orig.bz2 
+exitcode=$?
+$PEASOUP_HOME/tools/manual_test_import.sh --cmd "./bzip2 -k -s -c ls.orig > ls.orig.bz2" --prog bzip2 --infile ls.orig --outfile ls.orig.bz2 --name bzip2.footprint --exitcode $exitcode
+
+exit 0
 
 # test compression level 1
 bzip2 inputfile1 -k -1 -c > outputfile1 2> err
@@ -23,14 +27,9 @@ exitcode=$?
 $PEASOUP_HOME/tools/manual_test_import.sh --cmd "./bzip2 -k -9 inputfile1 --stdout > outputfile1 2> err" --prog bzip2 --infile inputfile1 --outfile outputfile1 --outfile err --name bzip2.k9 --exitcode $exitcode
 
 # test on larger file (like ls)
-bzip2 -k -8 -c ls.orig > ls.orig.bz2 2> err
-exitcode=$?
-$PEASOUP_HOME/tools/manual_test_import.sh --cmd "./bzip2 -k -8 -c ls.orig > ls.orig.bz2 2> err" --prog bzip2 --infile ls.orig --outfile err --outfile ls.orig.bz2 --name bzip2.ls --exitcode $exitcode
-
-# test small memory footprint option
-bzip2 -k -s -c ls.orig > ls.orig.bz2 2> err
+bzip2 -k -8 -c ls.orig > ls.orig.bz2 
 exitcode=$?
-$PEASOUP_HOME/tools/manual_test_import.sh --cmd "./bzip2 -k -s -c ls.orig > ls.orig.bz2 2> err" --prog bzip2 --infile ls.orig --outfile err --outfile ls.orig.bz2 --name bzip2.footprint --exitcode $exitcode
+$PEASOUP_HOME/tools/manual_test_import.sh --cmd "./bzip2 -k -8 -c ls.orig > ls.orig.bz2" --prog bzip2 --infile ls.orig --outfile ls.orig.bz2 --name bzip2.ls --exitcode $exitcode
 
 # test integrity check
 bzip2 -t ls.orig.bz2 

tests/coreutils/cat_manual_tests.sh

@@ -7,19 +7,23 @@ echo "hello" > inputfile1
 
 # test lots of options
 cat -Abetvsnu inputfile1 > outputfile1
-$PEASOUP_HOME/tools/manual_test_import.sh --cmd "./cat -Abetvsnu inputfile1 > outputfile1" --prog cat  --infile inputfile1 --outfile outputfile1 --name cat.shload_options
+exitcode=$?
+$PEASOUP_HOME/tools/manual_test_import.sh --cmd "./cat -Abetvsnu inputfile1 > outputfile1" --prog cat  --infile inputfile1 --outfile outputfile1 --name shload_options --exitcode $exitcode
 
 # test basic
 cat inputfile1 > outputfile1
-$PEASOUP_HOME/tools/manual_test_import.sh --cmd "./cat inputfile1 > outputfile1" --prog cat  --infile inputfile1 --outfile outputfile1 --name cat.basic
+exitcode=$?
+$PEASOUP_HOME/tools/manual_test_import.sh --cmd "./cat inputfile1 > outputfile1" --prog cat  --infile inputfile1 --outfile outputfile1 --name basic --exitcode $exitcode
 
 # test invalid options
 cat -MX inputfile1 2>&1 | grep -vi cat > outputfile1
-$PEASOUP_HOME/tools/manual_test_import.sh --cmd "./cat -MX inputfile1 2>&1 | grep -vi stratafied | grep -vi cat > outputfile1" --prog cat --infile inputfile1 --outfile outputfile1 --name cat.invalid_options
+exitcode=$?
+$PEASOUP_HOME/tools/manual_test_import.sh --cmd "./cat -MX inputfile1 2>&1 | grep -vi stratafied | grep -vi cat > outputfile1" --prog cat --infile inputfile1 --outfile outputfile1 --name invalid_options --exitcode $exitcode
 
 # test help 
 cat --help --version 2>&1 | grep -vi cat > outputfile1
-$PEASOUP_HOME/tools/manual_test_import.sh --cmd "./cat --help --version 2>&1 | grep -vi stratafied | grep -vi cat > outputfile1" --prog cat --outfile outputfile1 --name cat.usage
+exitcode=$?
+$PEASOUP_HOME/tools/manual_test_import.sh --cmd "./cat --help --version 2>&1 | grep -vi stratafied | grep -vi cat > outputfile1" --prog cat --outfile outputfile1 --name usage --exitcode $exitcode
 
 # cleanup
 rm inputfile1 outputfile1

tests/coreutils/ls_manual_tests.sh

@@ -35,7 +35,7 @@ $PEASOUP_HOME/tools/manual_test_import.sh --cmd "./ls --ignore=hello inputfile1
 # test invalid options
 ls -MX inputfile1 
 exitcode=$?
-$PEASOUP_HOME/tools/manual_test_import.sh --cmd "./ls inputfile1" --prog ls --infile inputfile1 --name ls.invalid_options --exitcode $exitcode
+$PEASOUP_HOME/tools/manual_test_import.sh --cmd "./ls -MX inputfile1" --prog ls --infile inputfile1 --name ls.invalid_options --exitcode $exitcode
 
 # test help 
 exitcode=$?