Makefile tweaks

diff --git a/Makefile b/Makefile
index 45ca649..616026c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -424,6 +424,11 @@ sun_dir = /home/am77536/fleet
 sun_fs_server = ivans
 sun_server = simmons
 
+#sun_dir = /root/fleet
+#sun_fs_server = vm
+#sun_server = localhost
+#sun_server_user = root
+
 #sun_server = frehley  # electric team uses frehley
 #sun_server = simmons
 #sun_server = criss    # criss is used for nohupped nanosim
@@ -431,13 +436,14 @@ sun_server = simmons
 
 #testnum = 3025
 #testnum = 3040
-#testnum = 0
+testnum = 7777
 #testnum = 999
-testnum = 8888
+#testnum = 0
+#testnum = 8888
 
 runtest: fleet.jar chips/marina/testCode/marina.xml chips/marina/testCode/marina.v chips/marina/testCode/marina.schematic-parasitics.spi
        ${rsync} --delete ./ ${sun_fs_server}:${sun_dir}/
-       time ssh -t -Y ${sun_fs_server} 'ssh -t am77536@${sun_server} "cd ${sun_dir}/; make testlocal impl=${impl}"'
+       time ssh -t -Y ${sun_fs_server} 'ssh -t ${sun_server_user}@${sun_server} "cd ${sun_dir}/; make testlocal impl=${impl}"'
 
 spice: fleet.jar
        cp ~/omegaCounter.spi chips/marina/testCode/omegaCounter.spi
@@ -456,7 +462,7 @@ testlocal: fleet.jar
        cd chips/marina/testCode; \
          export PATH=/proj/async/cad/linux/bin/:$$PATH; \
          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/proj/async/cad/test/; \
-         /proj/async/cad/linux/lib/jdk1.6/bin/java \
+         java \
          -cp `pwd`/../../../lib/com.sun.async.test.jar:`pwd`/../../../fleet.jar \
          -Djava.library.path=/proj/async/cad/test/ \
          -Dfleet.impl=com.sun.vlsi.chips.marina.test.Marina \