merge changes from HEAD

[plcapi.git] / peers-test.mk

diff --git a/peers-test.mk b/peers-test.mk
index 5d5d043..96fe2f2 100644 (file)
--- a/peers-test.mk
+++ b/peers-test.mk
@@ -18,7 +18,7 @@ all:help
 ####################
 PUSH=pclean pplc1 papi1 pplc2 papi2
 #EXTRA-PUSHS= ./Shell.py ./TestPeers.py ./planetlab4.sql ./dummy-config ./peers-test.mk ./person-password.sh
-EXTRA-PUSHS=  ./TestPeers.py ./planetlab4.sql ./dummy-config ./peers-test.mk ./person-password.sh ./plcsh
+EXTRA-PUSHS=  ./TestPeers.py ./planetlab4.sql ./peers-test.mk ./person-password.sh ./plcsh
 
 push:$(PUSH)
 
@@ -123,9 +123,11 @@ peer-push-cacert: peer-push-cacert-1 peer-push-cacert-2
 peer-push-cacert-1:
        scp $(PLC1SSH):/etc/planetlab/api_ca_ssl.crt ./api_plc1.crt
        scp ./api_plc1.crt $(PLC2SSH):/etc/planetlab/
+       scp ./api_plc1.crt $(PLC1SSH):/etc/planetlab/
 peer-push-cacert-2:
        scp $(PLC2SSH):/etc/planetlab/api_ca_ssl.crt ./api_plc2.crt
        scp ./api_plc2.crt $(PLC1SSH):/etc/planetlab/
+       scp ./api_plc2.crt $(PLC2SSH):/etc/planetlab/
 
 HELP += peers-clean
 peers-clean: peers-clean-1 peers-clean-2
@@ -184,7 +186,10 @@ ckp: ckp-en
 # variant runs
 VARIANT-TESTS :=
 
-# run end of test (after it was populated) with normal size
+# run end of test (after it was populated) with mini size
+VARIANT-TESTS += run-em
+run-em:
+       $(PY) ./TestPeers.py -e -m > testpeers-em.out 2>&1
 VARIANT-TESTS += run-en
 run-en:
        $(PY) ./TestPeers.py -e > testpeers-en.out 2>&1