...

Former-commit-id: 23fd2e3a6521ee27f0bebc000d0c4524b041531f

tests/coreutils/Makefile

@@ -7,6 +7,9 @@ all:	${progs}
 ls.peasoup:
 	${PEASOUP_HOME}/tools/ps_analyze.sh ${PEASOUP_HOME}/stock_examples/coreutils-7.4.shared/ls ls.peasoup ${ps_analyze_flags} --manual_test_script `pwd`/ls_manual_tests.sh
 
+ls.peasoup.static:
+	${PEASOUP_HOME}/tools/ps_analyze.sh ${PEASOUP_HOME}/stock_examples/coreutils-7.4.static/ls ls.peasoup.static ${ps_analyze_flags} --manual_test_script `pwd`/ls_manual_tests.sh
+
 cat.peasoup:
 	${PEASOUP_HOME}/tools/ps_analyze.sh ${PEASOUP_HOME}/stock_examples/coreutils-7.4.shared/cat cat.peasoup ${ps_analyze_flags} --manual_test_script `pwd`/cat_manual_tests.sh
 

tests/coreutils/bzip2_manual_tests.sh

@@ -4,6 +4,9 @@ echo "hello" > inputfile1
 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 compression level 1
 bzip2 inputfile1 -k -1 -c > outputfile1 2> err
 $PEASOUP_HOME/tools/manual_test_import.sh --cmd "./bzip2 -k -1 inputfile1 -c > outputfile1 2> err" --prog bzip2 --infile inputfile1 --outfile outputfile1 --outfile err --name bzip2.k1

tests/coreutils/cat_manual_tests.sh

@@ -5,6 +5,10 @@
 #
 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 shload_options
+
 # test basic
 cat inputfile1 > outputfile1
 $PEASOUP_HOME/tools/manual_test_import.sh --cmd "./cat inputfile1 > outputfile1" --prog cat  --infile inputfile1 --outfile outputfile1 --name basic
@@ -17,9 +21,5 @@ $PEASOUP_HOME/tools/manual_test_import.sh --cmd "./cat -MX inputfile1 2>&1 | gre
 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 usage
 
-# 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 shload_options
-
 # cleanup
 rm inputfile1 outputfile1

tests/coreutils/ls_manual_tests.sh

@@ -12,9 +12,15 @@
 #        we filter out the lines that use argv[0] as a workaround
 #      - timestamp info will differ b/c we're copying files around as part of manual_test_import
 #
+# NOTE: put the most complicated tests (those that are most likely to fail) first!
 
 echo "hello" > inputfile1
 
+# test whole bunch of options -- output is non-deterministic so we just make sure we have the same number of lines
+# also when something goes wrong during testing, the program usually just crashes
+ls -ltarHksbBiXR inputfile1 | wc -l > outputfile1
+$PEASOUP_HOME/tools/manual_test_import.sh --cmd "./ls -ltarHksbBiXR inputfile1 | wc -l > outputfile1" --prog foobar --infile inputfile1 --outfile outputfile1 --name shload_flags
+
 # basic functionality -- don't bother with comparing outputs
 $PEASOUP_HOME/tools/manual_test_import.sh --cmd "./ls" --prog ls