add testlocal target and targets for auto-generated files

diff --git a/Makefile b/Makefile
index cfc5798..fccc947 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -356,12 +356,38 @@ sun_server = simmons-tunnel
 #sun_server = criss    # criss is used for nohupped nanosim
 #sun_server = stanley  # stanley is used for nohupped hsim
 
-runtest: fleet.jar
+runtest: fleet.jar suncvs/marina/testCode/marina.xml suncvs/marina/testCode/marina.v suncvs/marina/testCode/marina.schematic-parasitics.spi
        rm lib/suncvs.jar; make lib/suncvs.jar
        cp lib/suncvs.jar suncvs/marina/testCode/MarinaTest.jar
-       ssh ${sun_server} 'skill nanosim'
-       rsync -are ssh --delete --progress --verbose ./ ${sun_server}:~/fleet/
-       ssh -Y ${sun_server} 'export PATH=/proj/async/cad/linux/bin/:$$PATH; cd ~/fleet/suncvs/marina/testCode; /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java -cp $$HOME/fleet/lib/suncvs.jar com.sun.vlsi.chips.marina.test.MarinaTest -testNum 3'
+#      ssh ${sun_server} 'skill nanosim; skill verilog; skill verilog.exe; skill java'
+#      ssh ${sun_server} find fleet/ -name .nfs\* -exec mv {} ~/tmp/ \\\;
+       rsync -azre ssh --delete --progress --verbose ./ ${sun_server}:~/fleet/
+       time ssh -t -Y ${sun_server} 'cd ~/fleet/; make testlocal'
+
+testlocal:
+       cd suncvs/marina/testCode; \
+         export PATH=/proj/async/cad/linux/bin/:$$PATH; \
+         /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java \
+         -cp `pwd`/../../../lib/suncvs.jar \
+         com.sun.vlsi.chips.marina.test.MarinaTest \
+         -hsim \
+         -testNum 3040
+
+electric_jar = ~/proj/electric/srcj/electric.jar
+electric = java -Xss2m -XX:MaxPermSize=128m -Xmx2000m -jar ${electric_jar}
+electric_headless = java -Xmx1500m -jar -Djava.awt.headless=true ${electric_jar} -batch
+all_electric_files = $(shell find suncvs/marina/electric/ -name \*.jelib -or -path \*.delib\*)
+
+suncvs/marina/testCode/marina.xml \
+suncvs/marina/testCode/marina.v \
+suncvs/marina/testCode/marina.schematic-parasitics.spi: ${all_electric_files}
+       @echo
+       @echo == Rebuilding Netlists and XML ===========================================================
+       rm -f suncvs/marina/testCode/marina.v
+       rm -f suncvs/marina/testCode/marina.schematic-parasitics.spi
+       rm -f suncvs/marina/testCode/marina.xml
+       cd suncvs/marina/testCode; \
+         nice -n 19 ${electric_headless} -s regen.bsh ../electric/aMarinaM.delib
 
 electric:
        ${electric} suncvs/marina/electric/aMarinaM.delib