improve marina testing scripts

diff --git a/Makefile b/Makefile
index 00423e6..d52a2f7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -211,15 +211,18 @@ cleansuncvs:
        rm -rf lib/suncvs.jar suncvs
 
 lib/suncvs.jar: fleet.jar suncvs/marina suncvs/test
+       rm -rf suncvs/test/manuals
        mkdir -p suncvs/build
        cd suncvs; javac -cp ../fleet.jar:test/javamake.jar:test/jcommon.jar:test/jfreechart.jar -d build `find . -name \*.java`
        cd suncvs/build; jar cvf ../../lib/suncvs.jar .
        cd suncvs/test; jar uvf ../../lib/suncvs.jar .
 
-runtest: fleet.jar  lib/suncvs.jar
+runtest: fleet.jar
+       rm lib/suncvs.jar; make lib/suncvs.jar
+       rm -f suncvs/marina/testSims/isolatedInDock.spi.run
        ssh simmons 'skill nanosim'
        rsync -are ssh --delete --progress --verbose ./ simmons:~/fleet/
-       ssh simmons 'export PATH=$$PATH:/proj/async/cad/linux/bin/; cd ~/fleet/suncvs/marina/testSims; /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java -cp $$HOME/fleet/fleet.jar:$$HOME/fleet/lib/suncvs.jar com.sun.vlsi.chips.marina.test.MarinaTest -testNum 3'
+       ssh simmons 'export PATH=$$PATH:/proj/async/cad/linux/bin/; cd ~/fleet/suncvs/marina/testSims; /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java -cp $$HOME/fleet/fleet.jar:$$HOME/fleet/lib/suncvs.jar com.sun.vlsi.chips.marina.test.MarinaTest -testNum 3001'
 
 suncvs/test:
        mkdir -p suncvs