From 9d3f517423588bc5e03716cc885a7858f4c70986 Mon Sep 17 00:00:00 2001 From: Egan Ford Date: Thu, 7 Jan 2016 10:10:09 -0700 Subject: [PATCH] minor test clean up --- done.tiff => dskappleiie.tiff | Bin dskappleiiplus.tiff | Bin 0 -> 15152 bytes test.scrp | 12 +++++++----- test.sh | 18 +++++++++++++++--- 4 files changed, 22 insertions(+), 8 deletions(-) rename done.tiff => dskappleiie.tiff (100%) create mode 100644 dskappleiiplus.tiff diff --git a/done.tiff b/dskappleiie.tiff similarity index 100% rename from done.tiff rename to dskappleiie.tiff diff --git a/dskappleiiplus.tiff b/dskappleiiplus.tiff new file mode 100644 index 0000000000000000000000000000000000000000..0cbe040bb9490d7fda72304d85240acf5ebc1dc3 GIT binary patch literal 15152 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 literal 0 HcmV?d00001 diff --git a/test.scrp b/test.scrp index d70d59f..3c46545 100644 --- a/test.scrp +++ b/test.scrp @@ -2,13 +2,15 @@ on run argv set my_path to (system attribute "PWD") & "/" set my_test to item 1 of argv + set my_done to item 2 of argv tell application "Virtual ][" activate delay 0.5 -- Close all open machines close every machine saving no - -- Create a standard Apple //els + -- Create a new (AppleIIe, AppleIIPlus, AppleII) + -- set theMachine to (make new AppleIIPlus) set theMachine to (make new AppleIIe) tell theMachine -- Change to a color screen @@ -28,14 +30,14 @@ on run argv set speed to maximum try - with timeout of 30 seconds + with timeout of 25 seconds -- repeat until the last line of the compact screen text = "DONE. PRESS [RETURN] TO REBOOT." -- delay 0.5 -- end repeat - waiting until screen equals imagefile POSIX path of (my_path & "done.tiff") + waiting until screen equals imagefile POSIX path of (my_path & my_done) end timeout on error - return "\nIMAGE WRITE TIMEOUT!!! Check Virtual ][ screen. Test aborted.\n\n" + return "ERROR: TIMEOUT: Virtual ][ screen != " & my_done end try -- short test of image, not necessary, next 3 lines can be removed @@ -44,8 +46,8 @@ on run argv -- delay 3 end tell + delay 0.5 close every machine saving no - delay 0.25 quit end tell end run diff --git a/test.sh b/test.sh index b573943..6e1216e 100755 --- a/test.sh +++ b/test.sh @@ -10,15 +10,27 @@ CMD=("./c2t-96h" "wine c2t-96h.exe") # Disks (and paths to disks) cannot have spaces in names. IMAGES="disks/zork.dsk disks/dangerous_dave.po" -dsk_test() +_test() { IMAGE=$1 + DONE=$2 BASENAME=$(basename $1) FILETYPE=$(echo $BASENAME | awk -F. '{print $NF}') dd if=/dev/zero of=test.$FILETYPE bs=1k count=140 >/dev/null 2>&1 - osascript test.scrp test.${FILETYPE} + if ! OUTPUT=$(osascript test.scrp test.${FILETYPE} $DONE) + then + echo + return 1 + fi + + if echo $OUTPUT | grep ERROR >/dev/null 2>&1 + then + echo $OUTPUT + echo + return 1 + fi S1=$(md5sum ${IMAGE} | awk '{print $1}') S2=$(md5sum test.$FILETYPE | awk '{print $1}') @@ -39,7 +51,7 @@ do do echo ${CMD[$j]} $i test.aif eval ${CMD[$j]} $i test.aif - if dsk_test $i + if _test $i dskappleiie.tiff then echo "$i passed" echo