X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=6307b0e09d62fe1ca3fa8d5689a96aa4414c8ddc;hb=79e5afa7283db57e1e6c63b879b0bf5f9fc39966;hp=ce205fb2ebb087bdfd02111d21b405740eef9d35;hpb=c5a81b4b1730b55ae77947584b3eb75de194a13f;p=fleet.git diff --git a/Makefile b/Makefile index ce205fb..6307b0e 100644 --- a/Makefile +++ b/Makefile @@ -484,7 +484,7 @@ endif urjtag: fleet.jar chips/marina/testCode/marina.xml ${rsync} --delete ./ root@goliath:fleet/ ${rsync} --delete ~/proj/electric/srcj/electric.jar root@goliath:electric.jar - ssh -t root@goliath 'cd fleet/chips/marina/testCode; java -cp ../../../fleet.jar:/root/electric.jar -Dfleet.impl=com.sun.vlsi.chips.marina.test.Marina com.sun.vlsi.chips.marina.test.MarinaTest -silicon -testNum 0' + ssh -t root@goliath 'cd fleet/chips/marina/testCode; java -cp ../../../fleet.jar:/root/electric.jar -Dfleet.impl=edu.berkeley.fleet.marina.Marina edu.berkeley.fleet.marina.MarinaTest -silicon -testNum 0' testlocal: fleet.jar cd chips/marina/testCode; \ @@ -492,8 +492,8 @@ testlocal: fleet.jar java \ -cp ~/proj/electric/srcj/electric.jar:`pwd`/../../../fleet.jar \ -Djava.library.path=/proj/async/cad/test/ \ - -Dfleet.impl=com.sun.vlsi.chips.marina.test.Marina \ - com.sun.vlsi.chips.marina.test.MarinaTest \ + -Dfleet.impl=edu.berkeley.fleet.marina.Marina \ + edu.berkeley.fleet.marina.MarinaTest \ ${testarg} \ -testNum ${testnum} || tail -n 20 marina.spi.run