diff --git a/.Floppies/A2OSX.MAKE.po b/.Floppies/A2OSX.MAKE.po index fad167ad..45257087 100644 Binary files a/.Floppies/A2OSX.MAKE.po and b/.Floppies/A2OSX.MAKE.po differ diff --git a/.Floppies/STABLE.140.dsk b/.Floppies/STABLE.140.dsk index 841c12fa..04a972ea 100644 Binary files a/.Floppies/STABLE.140.dsk and b/.Floppies/STABLE.140.dsk differ diff --git a/TESTS/ARGTEST2.txt b/TESTS/ARGTEST2.txt index 547c3fbf..1d492f79 100644 --- a/TESTS/ARGTEST2.txt +++ b/TESTS/ARGTEST2.txt @@ -161,7 +161,8 @@ SET T = $T + 1 IF [ $8 -EQ $$ ] IF [ -N $Log ] SET P = $P + 1 - echo "ARGTEST Arg 8 Passed" >> ${Log} + echo "ARGTEST Arg 8 Passed" + >> ${Log} FI echo "ARGTEST Arg 8 Passed" ELSE diff --git a/TESTS/BUILDTEST.txt b/TESTS/BUILDTEST.txt index dcdf93c8..9702e399 100644 --- a/TESTS/BUILDTEST.txt +++ b/TESTS/BUILDTEST.txt @@ -63,32 +63,58 @@ SET F = 0 # . BADSHTEST ECHO "\n----------------------------------------\n" >> ${Log} +ECHO "\n Calling ECHOTEST\n" >> ${Log} +ECHO "\n----------------------------------------\n" >> ${Log} . ECHOTEST ECHO "\n----------------------------------------\n" >> ${Log} +ECHO "\n Calling VTTEST\n" >> ${Log} +ECHO "\n----------------------------------------\n" >> ${Log} . VTTEST ECHO "\n----------------------------------------\n" >> ${Log} +ECHO "\n Calling CATTEST\n" >> ${Log} +ECHO "\n----------------------------------------\n" >> ${Log} . CATTEST ECHO "\n----------------------------------------\n" >> ${Log} +ECHO "\n Calling ARGTEST\n" >> ${Log} +ECHO "\n----------------------------------------\n" >> ${Log} . ARGTEST ECHO "\n----------------------------------------\n" >> ${Log} +ECHO "\n Calling IFLEVEL\n" >> ${Log} +ECHO "\n----------------------------------------\n" >> ${Log} . IFLEVEL ECHO "\n----------------------------------------\n" >> ${Log} +ECHO "\n Calling MD5TEST\n" >> ${Log} +ECHO "\n----------------------------------------\n" >> ${Log} . MD5TEST ECHO "\n----------------------------------------\n" >> ${Log} +ECHO "\n Calling IFZNTEST\n" >> ${Log} +ECHO "\n----------------------------------------\n" >> ${Log} . IFZNTEST ECHO "\n----------------------------------------\n" >> ${Log} +ECHO "\n Calling IFFILETEST\n" >> ${Log} +ECHO "\n----------------------------------------\n" >> ${Log} . IFFILETEST ECHO "\n----------------------------------------\n" >> ${Log} +ECHO "\n Calling IFSTRTEST\n" >> ${Log} +ECHO "\n----------------------------------------\n" >> ${Log} . IFSTRTEST ECHO "\n----------------------------------------\n" >> ${Log} +ECHO "\n Calling IFNUMTEST\n" >> ${Log} +ECHO "\n----------------------------------------\n" >> ${Log} . IFNUMTEST ECHO "\n----------------------------------------\n" >> ${Log} +ECHO "\n Calling IFANDORTEST\n" >> ${Log} +ECHO "\n----------------------------------------\n" >> ${Log} . IFANDORTEST ECHO "\n----------------------------------------\n" >> ${Log} +ECHO "\n Calling WHILETEST\n" >> ${Log} +ECHO "\n----------------------------------------\n" >> ${Log} . WHILETEST # # End of Tests # +ECHO "\n----------------------------------------\n" >> ${Log} +ECHO "\n All Tests Run\n" >> ${Log} echo "----------------------------------------" echo " Total Tests: ${T}" echo " Tests Passed: ${P}" diff --git a/TESTS/LOGALL.txt b/TESTS/LOGALL.txt new file mode 100644 index 00000000..277d55a1 --- /dev/null +++ b/TESTS/LOGALL.txt @@ -0,0 +1,36 @@ +NEW + PREFIX +AUTO 4,1 +#!/BIN/SH +# +# This script calls LOGATEST for all the same tests in BUILDTEST +# in the same order to see if we can find problems in individual +# tests. +# +LOGATEST BADSHTEST +PAUSE +LOGATEST ECHOTEST +PAUSE +LOGATEST VTTEST +PAUSE +LOGATEST CATTEST +PAUSE +LOGATEST ARGTEST +PAUSE +LOGATEST IFLEVEL +PAUSE +LOGATEST MD5TEST +PAUSE +LOGATEST IFZNTEST +PAUSE +LOGATEST IFFILETEST +PAUSE +LOGATEST IFSTRTEST +PAUSE +LOGATEST IFNUMTEST +PAUSE +LOGATEST IFANDORTEST +PAUSE +LOGATEST WHILETEST +MAN +TEXT /MAKE/USR/SHARE/TESTS/LOGALL diff --git a/TESTS/LOGATEST.txt b/TESTS/LOGATEST.txt new file mode 100644 index 00000000..17164eef --- /dev/null +++ b/TESTS/LOGATEST.txt @@ -0,0 +1,46 @@ +NEW + PREFIX +AUTO 4,1 +#!/BIN/SH +# +# This is the master script that calls all test scripts. +# It keeps a count of passed/failed tests and writes results +# to a log file. +# +# First Clear the Screen +echo "\f" +# +# Check to make sure the test exists +# +IF [ -F $1 ] +ELSE + ECHO "\n\nTest Not Found.\n\nExiting Script.\n\n" + EXIT 0 +FI +# +# Create and Set the Test Counters +# +SET T = 1 +SET P = 0 +SET F = 0 +# +# Create Log File +# +# Write Header To Log +# +SET Log = "/RAM3/${1}.LOG" +ECHO > ${Log} +ECHO >> ${Log} +ECHO " Log a Test - ${1}" >> ${Log} +echo "----------------------------------------" >> ${Log} +ECHO >> ${Log} +. $1 +ECHO >> ${Log} +echo "----------------------------------------" >> ${Log} +SET T = +SET P = +SET F = +SET B = +SET Log = +MAN +TEXT /MAKE/USR/SHARE/TESTS/LOGATEST