updated

diff --git a/TestPeers.py b/TestPeers.py
index 5808829..025c45b 100755 (executable)
--- a/TestPeers.py
+++ b/TestPeers.py
@@ -49,6 +49,15 @@ magic_slices = (1,2)
 number_magic=len(magic_slices)
 number_all_slices=number_slices+number_magic
 
+def set_env (nodes,slices):
+    global number_nodes, number_slices, magic_slices, number_magic, number_all_slices
+    number_nodes=nodes
+    number_slices=slices
+    magic_slices = (1,2)
+    number_magic=len(magic_slices)
+    number_all_slices=number_slices+number_magic
+    
+
 plc1={ 'plcname':'plc1 in federation',
        'hostname':'lurch.cs.princeton.edu',
        'url-format':'https://%s:443/PLCAPI/',

diff --git a/peers-test.mk b/peers-test.mk
index c2d5ad3..56d4433 100644 (file)
--- a/peers-test.mk
+++ b/peers-test.mk
@@ -3,7 +3,7 @@ CHROOT=/plc/root
 PORT=5432
 SITEDIR=/etc/planetlab/configs
 SITE=site.xml
-RPM=$(shell ls -rt myplc*rpm | tail -1)
+RPM=$(shell ls -rt /root/myplc*rpm | tail -1)
 APIDIR=/usr/share/plc_api
 
 PLC1=lurch.cs.princeton.edu
@@ -25,10 +25,12 @@ papi1:
        rsync -a -v -C ./ root@$(PLC1):new_plc_api/
 pplc1:
        rsync -a -v -C ./PLC/ root@$(PLC1):$(CHROOT)$(APIDIR)/PLC/
+       rsync -v -C ./planetlab4.sql root@$(PLC1):$(CHROOT)$(APIDIR)/planetlab4.sql
 papi2:
        rsync -a -v -C ./ root@$(PLC2):new_plc_api/
 pplc2:
        rsync -a -v -C ./PLC/ root@$(PLC2):$(CHROOT)$(APIDIR)/PLC/
+       rsync -v -C ./planetlab4.sql root@$(PLC2):$(CHROOT)$(APIDIR)/planetlab4.sql
 
 ####################
 DB=install-schema stop-clients clean-db restart