Makefile cleanups

diff --git a/Makefile b/Makefile
index f49d745..fb6cc23 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -417,12 +417,13 @@ f0: fleet.jar
 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 chips/marina/electric/ -name \*.jelib -or -path \*.delib\*)
+all_electric_files = $(shell find chips/marina/electric -name \*.jelib -or -path \*.delib/\* | grep -v :)
 modname = fakeMarinaPadframe
 
 sun_dir = /home/am77536/fleet
 sun_fs_server = ivans
 sun_server = simmons
+sun_server_user = am77536
 
 #sun_dir = /root/fleet
 #sun_fs_server = vm
@@ -436,20 +437,23 @@ sun_server = simmons
 
 #testnum = 3025
 #testnum = 3040
-testnum = 7777
+#testnum = 7777
 #testnum = 999
 #testnum = 0
-#testnum = 8888
+testnum = 8887
+#testnum = 8889
+#testnum = 6666
 
 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 ${sun_server_user}@${sun_server} "cd ${sun_dir}/; make testlocal impl=${impl}"'
+       time ssh -t -Y ${sun_fs_server} 'ssh -t ${sun_server_user}@${sun_server} "bash --login -c \"make -C ${sun_dir} testlocal impl=${impl}\""'
+       scp ${sun_fs_server}:${sun_dir}/chips/marina/testCode/out.dat .
 
 spice: fleet.jar
        cp ~/omegaCounter.spi chips/marina/testCode/omegaCounter.spi
        cp ~/omegaCounter-extracted.spi chips/marina/testCode/omegaCounter-extracted.spi
        rsync -azre ssh --delete --progress --verbose ./ ${sun_fs_server}:${sun_dir}/
-       ssh -t -Y ${sun_fs_server} 'cd ${sun_dir}/chips/marina/testCode/; export PATH=/proj/async/cad/linux/bin/:$$PATH; echo -e "rcf commands\n" | hsim64 -time 90000 go.spi -o go.spi'
+       ssh -t -Y ${sun_fs_server} 'cd ${sun_dir}/chips/marina/testCode/; echo -e "rcf commands\n" | hsim64 -time 90000 go.spi -o go.spi'
 
 
 ifeq ($(impl),silicon)
@@ -458,10 +462,11 @@ else
 testarg=-hsim
 endif
 
+
+
 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/; \
+         export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/proj/async/cad/test/; \
          java \
          -cp `pwd`/../../../lib/com.sun.async.test.jar:`pwd`/../../../fleet.jar \
          -Djava.library.path=/proj/async/cad/test/ \