update which sun server I use

[fleet.git] / Makefile

diff --git a/Makefile b/Makefile
index 1ce55e1..cfc5798 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -350,8 +350,11 @@ lib/suncvs.jar: fleet.jar suncvs/marina suncvs/test
        cd suncvs/build; jar cvf ../../lib/suncvs.jar .
        cd suncvs/test; jar uvf ../../lib/suncvs.jar .
 
-sun_server = frehley
+#sun_server = frehley  # electric team uses frehley
 #sun_server = simmons
+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
        rm lib/suncvs.jar; make lib/suncvs.jar
@@ -361,8 +364,7 @@ runtest: fleet.jar
        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'
 
 electric:
-       rsync -are ssh --progress --verbose ${sun_server}:fleet/suncvs/marina/testSims/marina.spi.out ~/marina.spi.out
-       java -Xmx900m -jar /Applications/electric.jar suncvs/marina/electric/aMarinaM.jelib
+       ${electric} suncvs/marina/electric/aMarinaM.delib
 
 suncvs/test:
        mkdir -p suncvs
@@ -375,5 +377,10 @@ suncvs/marina:
 chaing: lib/suncvs.jar
        java -cp lib/suncvs.jar com.sun.async.test.ChainG suncvs/marina/testCode/marina.xml
 
-syncspi:
-       rsync -are ssh --progress --verbose frehley:fleet/suncvs/marina/testCode/marina.spi.out ~/marina.spi.out
+modname = fakeMarinaPadframe
+sync:
+       rsync -arze ssh --progress --verbose ${sun_server}:fleet/suncvs/marina/testCode/marina\*.dump ~/ || true
+       rsync -arze ssh --progress --verbose ${sun_server}:fleet/suncvs/marina/testCode/marina.spi.out ~/${modname}.out || true
+copyin:
+       cp ~/${modname}.spi suncvs/marina/testCode/marina.schematic-parasitics.spi || true
+       cp ~/${modname}.v   suncvs/marina/testCode/marina.v || true