gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r20474 - in gnunet-planetlab: . config_generator planetlab-


From: gnunet
Subject: [GNUnet-SVN] r20474 - in gnunet-planetlab: . config_generator planetlab-api
Date: Tue, 13 Mar 2012 13:00:18 +0100

Author: wachs
Date: 2012-03-13 13:00:18 +0100 (Tue, 13 Mar 2012)
New Revision: 20474

Added:
   gnunet-planetlab/config_generator/pre_run.sh
Removed:
   gnunet-planetlab/config_generator/1
Modified:
   gnunet-planetlab/02_planetlab-deps-from-source.sh
   gnunet-planetlab/03_planetlab-extractor.sh
   gnunet-planetlab/05_planetlab-gnunet.sh
   gnunet-planetlab/config_generator/master.cfg
   gnunet-planetlab/config_generator/master_config_generate.sh
   gnunet-planetlab/config_generator/master_restart.sh
   gnunet-planetlab/config_generator/nodes.txt
   gnunet-planetlab/config_generator/nodes_password.txt
   gnunet-planetlab/config_generator/password.txt
   gnunet-planetlab/config_generator/password_generate.sh
   gnunet-planetlab/config_generator/run.sh
   gnunet-planetlab/config_generator/setup_buildslave_parallel.sh
   gnunet-planetlab/planetlab-api/getnodes.py
Log:
at lest some backup


Modified: gnunet-planetlab/02_planetlab-deps-from-source.sh
===================================================================
--- gnunet-planetlab/02_planetlab-deps-from-source.sh   2012-03-13 10:30:03 UTC 
(rev 20473)
+++ gnunet-planetlab/02_planetlab-deps-from-source.sh   2012-03-13 12:00:18 UTC 
(rev 20474)
@@ -404,9 +404,6 @@
 cd ..
 }
 
-
-
-
 function cleanup_libunistring {
 #      cd ..
 #      rm -rf gnutls-2.12.9
@@ -500,7 +497,6 @@
 install_gnutls
 cleanup_gnutls
 
-
 #echo "INSTALLING libunistring"
 install_libunistring
 cleanup_libunistring

Modified: gnunet-planetlab/03_planetlab-extractor.sh
===================================================================
--- gnunet-planetlab/03_planetlab-extractor.sh  2012-03-13 10:30:03 UTC (rev 
20473)
+++ gnunet-planetlab/03_planetlab-extractor.sh  2012-03-13 12:00:18 UTC (rev 
20474)
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 echo "INSTALLING libxtractor"
+rm -rf Extractor
 svn checkout https://gnunet.org/svn/Extractor 1> /dev/null
 if [ $? = 0 ]
 then

Modified: gnunet-planetlab/05_planetlab-gnunet.sh
===================================================================
--- gnunet-planetlab/05_planetlab-gnunet.sh     2012-03-13 10:30:03 UTC (rev 
20473)
+++ gnunet-planetlab/05_planetlab-gnunet.sh     2012-03-13 12:00:18 UTC (rev 
20474)
@@ -2,12 +2,12 @@
 echo "INSTALLING GNUNET"
 svn checkout https://gnunet.org/svn/gnunet/ 1> /dev/null
 cd gnunet/
-sudo sudo rpm -e --nodeps libgcrypt
-sudo rpm -e libgpg-error-devel --nodeps
-sudo rpm -e libgpg-error --nodeps
-sudo sudo rpm -e --nodeps libgcrypt
-sudo rpm -e libgpg-error-devel --nodeps
-sudo rpm -e libgpg-error --nodeps
+#sudo sudo rpm -e --nodeps libgcrypt
+#sudo rpm -e libgpg-error-devel --nodeps
+#sudo rpm -e libgpg-error --nodeps
+#sudo sudo rpm -e --nodeps libgcrypt
+#sudo rpm -e libgpg-error-devel --nodeps
+#sudo rpm -e libgpg-error --nodeps
 
 ./bootstrap 1> /dev/null
 if [ $? = 0 ]
@@ -28,7 +28,7 @@
 fi
 
 
-sudo make clean all 1> /dev/null
+make clean all 1> /dev/null
 if [ $? = 0 ]
 then
 echo " make gnunet successfull"
@@ -37,7 +37,7 @@
 exit 1
 fi
 
-sudo make install 1> /dev/null
+make install 1> /dev/null
 if [ $? = 0 ]
 then
 echo " make install gnunet successfull"
@@ -46,7 +46,6 @@
 exit 1
 fi
 
+
 export GNUNET_PREFIX=$HOME/gnbuild
 export PATH=$PATH:$HOME/gnbuild/bin
-make check
-

Deleted: gnunet-planetlab/config_generator/1
===================================================================
--- gnunet-planetlab/config_generator/1 2012-03-13 10:30:03 UTC (rev 20473)
+++ gnunet-planetlab/config_generator/1 2012-03-13 12:00:18 UTC (rev 20474)
@@ -1 +0,0 @@
-notes

Modified: gnunet-planetlab/config_generator/master.cfg
===================================================================
--- gnunet-planetlab/config_generator/master.cfg        2012-03-13 10:30:03 UTC 
(rev 20473)
+++ gnunet-planetlab/config_generator/master.cfg        2012-03-13 12:00:18 UTC 
(rev 20474)
@@ -20,13 +20,14 @@
 # a tuple of bot-name and bot-password. These correspond to values given to
 # the buildslave's mktap invocation.
 from buildbot.buildslave import BuildSlave
-c['slaves'] =  
-               [
-               
-BuildSlave("planetlab-3.fing.edu.uy","b5Bp0VPRb8MrQ"),
-BuildSlave("planetlab1.comp.nus.edu.sg","QLIYmvec5dS0c")
-               ]
+c['slaves'] = [
 
+ BuildSlave("planetlab1.cs.vu.nl","PGoJWo..Fd5H."), 
+ BuildSlave("plewifi.ipv6.lip6.fr","IknbM1KUl5W3c"), 
+ BuildSlave("planetlab1.otemachi.wide.ad.jp","da1jyYxWiOzyM"), 
+ BuildSlave("planetlab2.pjwstk.edu.pl","s7S9gUkQIw3O6") 
+]
+
 # to limit to two concurrent builds on a slave, use
 #  c['slaves'] = [BuildSlave("bot1name", "bot1passwd", max_builds=2)]
 
@@ -34,7 +35,7 @@
 # 'slavePortnum' defines the TCP port to listen on. This must match the value
 # configured into the buildslaves (with their --master option)
 
-c['slavePortnum'] = 9989
+c['slavePortnum'] = 9990
 
 ####### CHANGESOURCES
 
@@ -76,10 +77,11 @@
                                  treeStableTimer=30*60,
                                 categories=["GNUnet"],
                                  builderNames=[
-                                       
-planetlab-3.fing.edu.uy,
-planetlab1.comp.nus.edu.sg
 
+"planetlab1.cs.vu.nl",
+"plewifi.ipv6.lip6.fr",
+"planetlab1.otemachi.wide.ad.jp",
+"planetlab2.pjwstk.edu.pl"
 ]))
 
 
@@ -113,63 +115,14 @@
 #rm-nat
 tmp = "/tmp/gnbuild"
 le_tmp = "/tmp/lebuild"
+tmp1 = "/home/tum_dht_testing/gnbuild"
 #c['change_source'] = [
 #                      SVNPoller(svnurl = "https://gnunet.org/svn/gnunet/";, 
category="GNUnet"),
 #                      SVNPoller(svnurl = "https://gnunet.org/svn/Extractor/";, 
category="Extractor"),
 #              ]
 
-f1 = factory.BuildFactory()
 
-f1.addStep(source.SVN(mode='update', svnurl = 
"https://gnunet.org/svn/gnunet-planetlab/";))
-
-f1.addStep(shell.ShellCommand, command=["sh", "-c", 
"./00_planetlab-certificate-install.sh"],
-       description="Installing svn certificate",
-       name="Install-Certificate gnunet.org",
-       haltOnFailure=True,
-       timeout=30)
-
-
-f1.addStep(shell.ShellCommand, command=["sh", "-c", 
"./00_planetlab-remove.sh"],
-       description="Removing Previous Libcrypt version",
-       name="remove prev-ligcrypt",
-       haltOnFailure=True,
-       timeout=30)
-
-
-f1.addStep(shell.ShellCommand, command=["sh", "-c", 
"./01_planetlab-dependencies.sh"],
-       description="Installing gnunet dependencies",
-       name="install dependencies",
-       haltOnFailure=True,
-       timeout=30)
-
-
-f1.addStep(shell.ShellCommand, command=["sh", "-c", 
"./02_planetlab-deps-from-source.sh"],
-       description="Installing more dependencies",
-       name="install more dependencies",
-       haltOnFailure=True,
-       timeout=30)
-
-
-f1.addStep(shell.ShellCommand, command=["sh", "-c", 
"./03_planetlab-extractor.sh"],
-       description="Installing Extractor",
-       name="install Extractor",
-       haltOnFailure=True,
-       timeout=30)
-
-f1.addStep(shell.ShellCommand, command=["sh", "-c", 
"./04_planetlab-libmicrohttpd.sh"],
-       description="Installing Libmicrohttpd",
-       name="install Libmicrohttpd",
-       haltOnFailure=True,
-       timeout=30)
-
-
-f1.addStep(shell.ShellCommand, command=["sh", "-c", 
"./05_planetlab-gnunet.sh"],
-       description="Installing Gnunet",
-       name="install Gnunet",
-       haltOnFailure=True,
-       timeout=30)
-
-
+f1 = factory.BuildFactory()
 f1.addStep(source.SVN(mode='update', svnurl = 
"https://gnunet.org/svn/gnunet/";))
 f1.addStep(shell.ShellCommand, command=["sh", "-c", "killall 
gnunet-service-arm || true; svn -R revert *; rm -rf /tmp/gnunet*; rm -rf 
/tmp/test*;"],
        description="clean up from previous runs",
@@ -180,947 +133,178 @@
        description="bootstrap",
        name="bootstrap",
        haltOnFailure=True)
-f1.addStep(shell.Configure, command=["sh", "-c", "./configure 
--enable-benchmarks --enable-expensive-tests --prefix=" + tmp],
+f1.addStep(shell.Configure, command=["sh", "-c", "./configure 
--enable-benchmarks --enable-expensive-tests --with-extractor=/usr/local 
--prefix=" + tmp],
        description="configure",
        name="configure",
        haltOnFailure=True)
 f1.addStep(shell.Compile,command=["sh", "-c", "make install"])
-f1.addStep(shell.ShellCommand,description=["tests util"],
-          name="tests util",
-          usePTY=True,
-          command=["sh", "-c", "cd src/util; ../../contrib/timeout_watchdog 
900 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand,description=["tests block"],
-          name="tests block",
-          usePTY=True,
-          command=["sh", "-c", "cd src/block; ../../contrib/timeout_watchdog 
600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand, description=["tests statistics"],
-          name="tests statistics",
-          usePTY=True,
-          command=["sh", "-c", "cd src/statistics; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand, description=["tests arm"],
-          name="tests arm",
-          usePTY=True,
-          command=["sh", "-c", "cd src/arm; ../../contrib/timeout_watchdog 600 
make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand, description=["tests hello"],
-          name="tests hello",
-          usePTY=True,
-          command=["sh", "-c", "cd src/hello; ../../contrib/timeout_watchdog 
600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand, description=["tests peerinfo"],
-          name="tests peerinfo",
-          usePTY=True,
-          command=["sh", "-c", "cd src/peerinfo; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand, description=["tests datacache"],
-          name="tests datacache",
-          usePTY=True,
-          command=["sh", "-c", "cd src/datacache; 
../../contrib/timeout_watchdog 900 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand, description=["tests datastore"],
-          name="tests datastore",
-          usePTY=True,
-          command=["sh", "-c", "cd src/datastore; 
../../contrib/timeout_watchdog 1800 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand, description=["tests template"],
-          name="tests template",
-          usePTY=True,
-          command=["sh", "-c", "cd src/template; 
../../contrib/timeout_watchdog 3600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand, description=["tests fragmentation"],
-          name="tests fragmentation",
-          usePTY=True,
-          command=["sh", "-c", "cd src/fragmentation; 
../../contrib/timeout_watchdog 3600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand, description=["tests transport"],
-          name="tests transport",
-          usePTY=True,
-          command=["sh", "-c", "rm -rf /tmp/test-transport; cd src/transport; 
../../contrib/timeout_watchdog 7200 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']},
-          timeout=7200)
-f1.addStep(shell.ShellCommand, description=["tests peerinfo-tool"],
-          name="tests peerinfo-tool",
-          usePTY=True,
-          command=["sh", "-c", "cd src/peerinfo-tool; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand, description=["tests core"],
-          name="tests core",
-          usePTY=True,
-          command=["sh", "-c", "cd src/core; ../../contrib/timeout_watchdog 
1800 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand, description=["tests testing"],
-          name="tests testing",
-          usePTY=True,
-          command=["sh", "-c", "cd src/testing; ../../contrib/timeout_watchdog 
1800 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand,description=["tests nse"],
-          name="tests nse",
-          usePTY=True,
-          command=["sh", "-c", "cd src/nse; ../../contrib/timeout_watchdog 
1800 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand, description=["tests dht"],
-          name="tests dht",
-          usePTY=True,
-          command=["sh", "-c", "cd src/dht; make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand, description=["tests hostlist"],
-          name="tests hostlist",
-          usePTY=True,
-          command=["sh", "-c", "cd src/hostlist; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand, description=["tests topology"],
-          name="tests topology",
-          usePTY=True,
-          command=["sh", "-c", "cd src/topology; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand, description=["tests nat"],
-          name="tests nat",
-          usePTY=True,
-          command=["sh", "-c", "cd src/nat; ../../contrib/timeout_watchdog 600 
make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand, description=["tests fs"],
-          name="tests fs",
-          usePTY=True,
-          command=["sh", "-c", "cd src/fs; ../../contrib/timeout_watchdog 3800 
make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand, description=["tests mesh"],
-          name="tests mesh",
-          usePTY=True,
-          command=["sh", "-c", "cd src/mesh; ../../contrib/timeout_watchdog 
600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1.addStep(shell.ShellCommand, description=["tests vpn"],
-          name="tests vpn",
-          usePTY=True,
-          command=["sh", "-c", "cd src/vpn; ../../contrib/timeout_watchdog 600 
make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-#f1.addStep(shell.ShellCommand, description=["tests monkey"],
-#         name="tests monkey",
+
+f1.addStep(shell.Configure, command=["sh", "-c", "gnunet-arm -c 
/home/tum_dht_testing/.gnunet/gnunet.conf -s"],         
+        description="starting gnunet-arm service",      
+        name="gnunet-arm service", 
+        env={'GNUNET_PREFIX': tmp1, 'PATH': tmp1 + "/bin:/bin:" + 
os.environ['PATH']}, 
+        haltOnFailure=True,
+       timeout=30758400)
+
+
+#f1.addStep(shell.ShellCommand,description=["tests util"],
+#         name="tests util",
 #         usePTY=True,
-#         command=["sh", "-c", "cd src/monkey; ../../contrib/timeout_watchdog 
600 make check; "],
+#         command=["sh", "-c", "cd src/util; ../../contrib/timeout_watchdog 
900 make check; "],
 #         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-
-f1_slow_machines = factory.BuildFactory()
-f1_slow_machines .addStep(source.SVN(mode='update', svnurl = 
"https://gnunet.org/svn/gnunet/";))
-f1_slow_machines .addStep(shell.ShellCommand, command=["sh", "-c", "killall 
gnunet-service-arm || true; svn -R revert *; rm -rf /tmp/gnunet*; rm -rf 
/tmp/test*;"],
-       description="clean up from previous runs",
-       name="killall",
-       haltOnFailure=False,
-       timeout=30)
-f1_slow_machines .addStep(shell.ShellCommand, command=["sh", "-c", 
"./bootstrap"],
-       description="bootstrap",
-       name="bootstrap",
-       haltOnFailure=True)
-f1_slow_machines .addStep(shell.Configure, command=["sh", "-c", "./configure 
--prefix=" + tmp],
-       description="configure",
-       name="configure",
-       haltOnFailure=True)
-f1_slow_machines .addStep(shell.Compile,command=["sh", "-c", "make install"])
-f1_slow_machines .addStep(shell.ShellCommand,description=["tests util"],
-          name="tests util",
-          usePTY=True,
-          command=["sh", "-c", "cd src/util; ../../contrib/timeout_watchdog 
900 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand,description=["tests block"],
-          name="tests block",
-          usePTY=True,
-          command=["sh", "-c", "cd src/block; ../../contrib/timeout_watchdog 
600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests statistics"],
-          name="tests statistics",
-          usePTY=True,
-          command=["sh", "-c", "cd src/statistics; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests arm"],
-          name="tests arm",
-          usePTY=True,
-          command=["sh", "-c", "cd src/arm; ../../contrib/timeout_watchdog 600 
make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests hello"],
-          name="tests hello",
-          usePTY=True,
-          command=["sh", "-c", "cd src/hello; ../../contrib/timeout_watchdog 
600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests peerinfo"],
-          name="tests peerinfo",
-          usePTY=True,
-          command=["sh", "-c", "cd src/peerinfo; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests datacache"],
-          name="tests datacache",
-          usePTY=True,
-          command=["sh", "-c", "cd src/datacache; 
../../contrib/timeout_watchdog 900 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests datastore"],
-          name="tests datastore",
-          usePTY=True,
-          command=["sh", "-c", "cd src/datastore; 
../../contrib/timeout_watchdog 1800 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests template"],
-          name="tests template",
-          usePTY=True,
-          command=["sh", "-c", "cd src/template; 
../../contrib/timeout_watchdog 3600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests 
fragmentation"],
-          name="tests fragmentation",
-          usePTY=True,
-          command=["sh", "-c", "cd src/fragmentation; 
../../contrib/timeout_watchdog 3600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests transport"],
-          name="tests transport",
-          usePTY=True,
-          command=["sh", "-c", "rm -rf /tmp/test-transport; cd src/transport; 
../../contrib/timeout_watchdog 7200 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']},
-          timeout=7200)
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests 
peerinfo-tool"],
-          name="tests peerinfo-tool",
-          usePTY=True,
-          command=["sh", "-c", "cd src/peerinfo-tool; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests core"],
-          name="tests core",
-          usePTY=True,
-          command=["sh", "-c", "cd src/core; ../../contrib/timeout_watchdog 
1800 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests testing"],
-          name="tests testing",
-          usePTY=True,
-          command=["sh", "-c", "cd src/testing; ../../contrib/timeout_watchdog 
1800 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines.addStep(shell.ShellCommand,description=["tests nse"],
-          name="tests nse",
-          usePTY=True,
-          command=["sh", "-c", "cd src/nse; ../../contrib/timeout_watchdog 
1800 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests dht"],
-          name="tests dht",
-          usePTY=True,
-          command=["sh", "-c", "cd src/dht; make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests hostlist"],
-          name="tests hostlist",
-          usePTY=True,
-          command=["sh", "-c", "cd src/hostlist; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests topology"],
-          name="tests topology",
-          usePTY=True,
-          command=["sh", "-c", "cd src/topology; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests nat"],
-          name="tests nat",
-          usePTY=True,
-          command=["sh", "-c", "cd src/nat; ../../contrib/timeout_watchdog 600 
make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests fs"],
-          name="tests fs",
-          usePTY=True,
-          command=["sh", "-c", "cd src/fs; ../../contrib/timeout_watchdog 3800 
make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests mesh"],
-          name="tests mesh",
-          usePTY=True,
-          command=["sh", "-c", "cd src/mesh; ../../contrib/timeout_watchdog 
600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f1_slow_machines .addStep(shell.ShellCommand, description=["tests vpn"],
-          name="tests vpn",
-          usePTY=True,
-          command=["sh", "-c", "cd src/vpn; ../../contrib/timeout_watchdog 600 
make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-#f1_slow_machines .addStep(shell.ShellCommand, description=["tests monkey"],
-#         name="tests monkey",
+#f1.addStep(shell.ShellCommand,description=["tests block"],
+#         name="tests block",
 #         usePTY=True,
-#         command=["sh", "-c", "cd src/monkey; ../../contrib/timeout_watchdog 
600 make check; "],
+#         command=["sh", "-c", "cd src/block; ../../contrib/timeout_watchdog 
600 make check; "],
 #         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-
-f2 = factory.BuildFactory()
-f2.addStep(source.SVN(mode='update', svnurl = 
"https://gnunet.org/svn/gnunet/";))
-f2.addStep(shell.ShellCommand, command=["sh", "-c", "killall 
gnunet-service-arm || true; svn -R revert *; rm -rf /tmp/gnunet*; rm -rf 
/tmp/test*;"],
-        description="clean up from previous runs",
-        name="killall",
-        haltOnFailure=False,
-       timeout=180)
-f2.addStep(shell.ShellCommand, command=["sh", "-c", "./bootstrap"],
-      description="bootstrap",
-      name="bootstrap",
-      haltOnFailure=True)
-f2.addStep(shell.Configure, command=["sh", "-c", "./configure 
--enable-benchmarks --enable-expensive-tests --prefix=" + tmp + " 
--with-extractor=/usr/local --with-mysql=/usr/local 
--with-microhttpd=/usr/local --with-mysql=/usr/local --with-postgres=/usr/local 
--with-libintl-prefix=/usr/local --with-iconv-prefix=/usr/local 
--with-ltdl-include=/usr/local/include --with-ltdl-lib=/usr/local/lib"],
-        description="configure",
-        name="configure",
-        haltOnFailure=True)
-f2.addStep(shell.Compile, command=["sh", "-c", "gmake install"])
-f2.addStep(shell.ShellCommand,description=["tests util"],
-          name="tests util",
-          usePTY=True,
-          command=["sh", "-c", "cd src/util; ../../contrib/timeout_watchdog 
900 gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand, description=["tests block"],
-          name="tests block",
-          usePTY=True,
-          command=["sh", "-c", "cd src/block; ../../contrib/timeout_watchdog 
600 gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand, description=["tests statistics"],
-          name="tests statistics",
-          usePTY=True,
-          command=["sh", "-c", "cd src/statistics; 
../../contrib/timeout_watchdog 600 gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand,description=["tests arm"],
-          name="tests arm",
-          usePTY=True,
-          command=["sh", "-c", "cd src/arm; ../../contrib/timeout_watchdog 600 
gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand,description=["tests hello"],
-          name="tests hello",
-          usePTY=True,
-          command=["sh", "-c", "cd src/hello; ../../contrib/timeout_watchdog 
600 gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand,description=["tests peerinfo"],
-          name="tests peerinfo",
-          usePTY=True,
-          command=["sh", "-c", "cd src/peerinfo; 
../../contrib/timeout_watchdog 600 gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand,description=["tests datacache"],
-          name="tests datacache",
-          usePTY=True,
-          command=["sh", "-c", "cd src/datacache; 
../../contrib/timeout_watchdog 900 gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand,description=["tests datastore"],
-          name="tests datastore",
-          usePTY=True,
-          command=["sh", "-c", "cd src/datastore; 
../../contrib/timeout_watchdog 1800 gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand,description=["tests template"],
-          name="tests template",
-          usePTY=True,
-          command=["sh", "-c", "cd src/template; 
../../contrib/timeout_watchdog 3600 gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand, description=["tests fragmentation"],
-          name="tests fragmentation",
-          usePTY=True,
-          command=["sh", "-c", "cd src/fragmentation; 
../../contrib/timeout_watchdog 3600 gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand,description=["tests transport"],
-          name="tests transport",
-          usePTY=True,
-          command=["sh", "-c", "rm -rf /tmp/test-transport; cd src/transport; 
../../contrib/timeout_watchdog 7200 gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']},
-          timeout=7200)
-f2.addStep(shell.ShellCommand,description=["tests peerinfo-tool"],
-          name="tests peerinfo-tool",
-          usePTY=True,
-          command=["sh", "-c", "cd src/peerinfo-tool; 
../../contrib/timeout_watchdog 600 gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand,description=["tests core"],
-          name="tests core",
-          usePTY=True,
-          command=["sh", "-c", "cd src/core; ../../contrib/timeout_watchdog 
1800 gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand,description=["tests testing"],
-          name="tests testing",
-          usePTY=True,
-          command=["sh", "-c", "cd src/testing; ../../contrib/timeout_watchdog 
1800 gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand,description=["tests nse"],
-          name="tests nse",
-          usePTY=True,
-          command=["sh", "-c", "cd src/nse; ../../contrib/timeout_watchdog 
1800 gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand,description=["tests dht"],
-          name="tests dht",
-          usePTY=True,
-          command=["sh", "-c", "cd src/dht; ../../contrib/timeout_watchdog 
1800 gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand,description=["tests hostlist"],
-          name="tests hostlist",
-          usePTY=True,
-          command=["sh", "-c", "cd src/hostlist; 
../../contrib/timeout_watchdog 600 gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand,description=["tests topology"],
-          name="tests topology",
-          usePTY=True,
-          command=["sh", "-c", "cd src/topology; 
../../contrib/timeout_watchdog 600 gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand,description=["tests nat"],
-          name="tests nat",
-          usePTY=True,
-          command=["sh", "-c", "cd src/nat; ../../contrib/timeout_watchdog 600 
gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand,description=["tests fs"],
-          name="tests fs",
-          usePTY=True,
-          command=["sh", "-c", "cd src/fs; ../../contrib/timeout_watchdog 3800 
gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand, description=["tests mesh"],
-          name="tests mesh",
-          usePTY=True,
-          command=["sh", "-c", "cd src/mesh; ../../contrib/timeout_watchdog 
600 gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f2.addStep(shell.ShellCommand, description=["tests vpn"],
-          name="tests vpn",
-          usePTY=True,
-          command=["sh", "-c", "cd src/vpn; ../../contrib/timeout_watchdog 600 
gmake check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-#f2.addStep(shell.ShellCommand, description=["tests monkey"],
-#         name="tests monkey",
+#f1.addStep(shell.ShellCommand, description=["tests statistics"],
+#         name="tests statistics",
 #         usePTY=True,
-#         command=["sh", "-c", "cd src/monkey; ../../contrib/timeout_watchdog 
600 make check; "],
+#         command=["sh", "-c", "cd src/statistics; 
../../contrib/timeout_watchdog 600 make check; "],
 #         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-
-# %PATH% and %GNUNET_PREFIX% have to be set before buildbot startup
-f3 = factory.BuildFactory()
-f3.addStep(source.SVN(mode='update', svnurl = 
"https://gnunet.org/svn/gnunet/";))
-f3.addStep(shell.ShellCommand,command=["sh", "-c", "killall_gnunet || true; 
svn -R revert *"],
-        description="cleanup old processes",
-        name="cleanup",
-        haltOnFailure=False)
-f3.addStep(shell.ShellCommand,command=["sh", "-c", "./bootstrap"],
-        description="bootstrap",
-        name="bootstrap",
-        haltOnFailure=True)
-f3.addStep(shell.Configure,command=["sh", "-c", "./configure 
--enable-benchmarks --enable-expensive-tests  --prefix=$GNUNET_PREFIX 
--with-microhttpd=/usr/local --with-extractor= --with-qt=/c/Qt/4.4.0"],
-        description="configure",
-        name="configure",
-        haltOnFailure=True)
-f3.addStep(shell.Compile,command=["sh", "-c", "make install"])
-f3.addStep(shell.ShellCommand, description=["tests util"],
-          name="tests util",
-          usePTY=True,
-          command=["sh", "-c", "cd src/util; make check; "])
-f3.addStep(shell.ShellCommand, description=["tests block"],
-          name="tests block",
-          usePTY=True,
-          command=["sh", "-c", "cd src/block; make check; "])
-f3.addStep(shell.ShellCommand, description=["tests statistics"],
-          name="tests statistics",
-          usePTY=True,
-          command=["sh", "-c", "cd src/statistics; make check; "])
-f3.addStep(shell.ShellCommand, description=["tests arm"],
-          name="tests arm",
-          usePTY=True,
-          command=["sh", "-c", "cd src/arm; make check; "])
-f3.addStep(shell.ShellCommand, description=["tests hello"],
-          name="tests hello",
-          usePTY=True,
-          command=["sh", "-c", "cd src/hello; make check; "])
-f3.addStep(shell.ShellCommand, description=["tests peerinfo"],
-          name="tests peerinfo",
-          usePTY=True,
-          command=["sh", "-c", "cd src/peerinfo; make check; "])
-f3.addStep(shell.ShellCommand, description=["tests datacache"],
-          name="tests datacache",
-          usePTY=True,
-          command=["sh", "-c", "cd src/datacache; make check; "])
-f3.addStep(shell.ShellCommand, description=["tests datastore"],
-          name="tests datastore",
-          usePTY=True,
-          command=["sh", "-c", "cd src/datastore; make check; "])
-f3.addStep(shell.ShellCommand, description=["tests template"],
-          name="tests template",
-          usePTY=True,
-          command=["sh", "-c", "cd src/template; make check; "])
-f3.addStep(shell.ShellCommand, description=["tests fragmentation"],
-          name="tests fragmentation",
-          usePTY=True,
-          command=["sh", "-c", "cd src/fragmentation; make check; "])
-f3.addStep(shell.ShellCommand, description=["tests transport"],
-          name="tests transport",
-          usePTY=True,
-          command=["sh", "-c", "rm -rf /tmp/test-transport; cd src/transport; 
make check; "],
-          timeout=7200)
-f3.addStep(shell.ShellCommand, description=["tests peerinfo-tool"],
-          name="tests peerinfo-tool",
-          usePTY=True,
-          command=["sh", "-c", "cd src/peerinfo-tool; make check; "])
-f3.addStep(shell.ShellCommand, description=["tests core"],
-          name="tests core",
-          usePTY=True,
-          command=["sh", "-c", "cd src/core; make check; "])
-f3.addStep(shell.ShellCommand, description=["tests testing"],
-          name="tests testing",
-          usePTY=True,
-          command=["sh", "-c", "cd src/testing; make check; "])
-f3.addStep(shell.ShellCommand,description=["tests nse"],
-          name="tests nse",
-          usePTY=True,
-          command=["sh", "-c", "cd src/nse; make check; "])
-f3.addStep(shell.ShellCommand, description=["tests dht"],
-          name="tests dht",
-          usePTY=True,
-          command=["sh", "-c", "cd src/dht; make check; "])
-f3.addStep(shell.ShellCommand, description=["tests hostlist"],
-          name="tests hostlist",
-          usePTY=True,
-          command=["sh", "-c", "cd src/hostlist; make check; "])
-f3.addStep(shell.ShellCommand, description=["tests topology"],
-          name="tests topology",
-          usePTY=True,
-          command=["sh", "-c", "cd src/topology; make check; "])
-f3.addStep(shell.ShellCommand, description=["tests nat"],
-          name="tests nat",
-          usePTY=True,
-          command=["sh", "-c", "cd src/nat; make check; "])
-f3.addStep(shell.ShellCommand, description=["tests fs"],
-          name="tests fs",
-          usePTY=True,
-          command=["sh", "-c", "cd src/fs; make check; "])
-f3.addStep(shell.ShellCommand, description=["tests mesh"],
-          name="tests mesh",
-          usePTY=True,
-          command=["sh", "-c", "cd src/mesh; ../../contrib/timeout_watchdog 
600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f3.addStep(shell.ShellCommand, description=["tests vpn"],
-          name="tests vpn",
-          usePTY=True,
-          command=["sh", "-c", "cd src/vpn; make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-#f3.addStep(shell.ShellCommand, description=["tests monkey"],
-#         name="tests monkey",
+#f1.addStep(shell.ShellCommand, description=["tests arm"],
+#         name="tests arm",
 #         usePTY=True,
-#         command=["sh", "-c", "cd src/monkey; make check; "],
+#         command=["sh", "-c", "cd src/arm; ../../contrib/timeout_watchdog 600 
make check; "],
 #         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-
-
-f4 = factory.BuildFactory()
-f4.addStep(source.SVN(mode='update', svnurl = 
"https://gnunet.org/svn/gnunet/";))
-f4.addStep(shell.ShellCommand,command=["sh", "-c", "killall gnunet-service-arm 
|| true; svn -R revert *; rm -rf /tmp/gnunet*; rm -rf /tmp/test*;"],
-        description="clean up from previous runs",
-        name="killall",
-        haltOnFailure=False,
-       timeout=30)
-f4.addStep(shell.ShellCommand,command=["sh", "-c", "./bootstrap"],
-      description="bootstrap",
-       name="bootstrap",
-          haltOnFailure=True)
-f4.addStep(shell.Configure,command=["sh", "-c", "./configure 
--enable-benchmarks --enable-expensive-tests  --prefix=" + tmp + " 
--with-extractor=/opt/local --with-mysql=/opt/local 
--with-microhttpd=/opt/local --with-mysql=/opt/local --with-postgres=/opt/local 
--with-libintl-prefix=/opt/local --with-iconv-prefix=/opt/local 
--with-ltdl-include=/opt/local/include --with-ltdl-lib=/opt/local/lib"],
-         description="configure",
-         name="configure",
-          haltOnFailure=True)
-f4.addStep(shell.Compile,command=["sh", "-c", "make install"])
-f4.addStep(shell.ShellCommand, description=["tests util"],
-          name="tests util",
-          usePTY=True,
-          command=["sh", "-c", "cd src/util; ../../contrib/timeout_watchdog 
900 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests block"],
-          name="tests block",
-          usePTY=True,
-          command=["sh", "-c", "cd src/block; ../../contrib/timeout_watchdog 
600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests statistics"],
-          name="tests statistics",
-          usePTY=True,
-          command=["sh", "-c", "cd src/statistics; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests arm"],
-          name="tests arm",
-          usePTY=True,
-          command=["sh", "-c", "cd src/arm; ../../contrib/timeout_watchdog 600 
make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests hello"],
-          name="tests hello",
-          usePTY=True,
-          command=["sh", "-c", "cd src/hello; ../../contrib/timeout_watchdog 
600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests peerinfo"],
-          name="tests peerinfo",
-          usePTY=True,
-          command=["sh", "-c", "cd src/peerinfo; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests datacache"],
-          name="tests datacache",
-          usePTY=True,
-          command=["sh", "-c", "cd src/datacache; 
../../contrib/timeout_watchdog 900 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests datastore"],
-          name="tests datastore",
-          usePTY=True,
-          command=["sh", "-c", "cd src/datastore; 
../../contrib/timeout_watchdog 1800 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests template"],
-          name="tests template",
-          usePTY=True,
-          command=["sh", "-c", "cd src/template; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests fragmentation"],
-          name="tests fragmentation",
-          usePTY=True,
-          command=["sh", "-c", "cd src/fragmentation; 
../../contrib/timeout_watchdog 3600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests transport"],
-          name="tests transport",
-          usePTY=True,
-          command=["sh", "-c", "rm -rf /tmp/test-transport; cd src/transport; 
../../contrib/timeout_watchdog 7200 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']},
-          timeout=7200)
-f4.addStep(shell.ShellCommand, description=["tests peerinfo-tool"],
-          name="tests peerinfo-tool",
-          usePTY=True,
-          command=["sh", "-c", "cd src/peerinfo-tool; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests core"],
-          name="tests core",
-          usePTY=True,
-          command=["sh", "-c", "cd src/core; ../../contrib/timeout_watchdog 
1800 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests testing"],
-          name="tests testing",
-          usePTY=True,
-          command=["sh", "-c", "cd src/testing; ../../contrib/timeout_watchdog 
1800 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand,description=["tests nse"],
-          name="tests nse",
-          usePTY=True,
-          command=["sh", "-c", "cd src/nse; ../../contrib/timeout_watchdog 
1800 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests dht"],
-          name="tests dht",
-          usePTY=True,
-          command=["sh", "-c", "cd src/dht; ../../contrib/timeout_watchdog 
1800 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests hostlist"],
-          name="tests hostlist",
-          usePTY=True,
-          command=["sh", "-c", "cd src/hostlist; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests topology"],
-          name="tests topology",
-          usePTY=True,
-          command=["sh", "-c", "cd src/topology; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests nat"],
-          name="tests nat",
-          usePTY=True,
-          command=["sh", "-c", "cd src/nat; ../../contrib/timeout_watchdog 600 
make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests fs"],
-          name="tests fs",
-          usePTY=True,
-          command=["sh", "-c", "cd src/fs; ../../contrib/timeout_watchdog 3800 
make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests mesh"],
-          name="tests mesh",
-          usePTY=True,
-          command=["sh", "-c", "cd src/mesh; ../../contrib/timeout_watchdog 
600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f4.addStep(shell.ShellCommand, description=["tests vpn"],
-          name="tests vpn",
-          usePTY=True,
-          command=["sh", "-c", "cd src/vpn; ../../contrib/timeout_watchdog 600 
make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-#f4.addStep(shell.ShellCommand, description=["tests monkey"],
-#         name="tests monkey",
+#f1.addStep(shell.ShellCommand, description=["tests hello"],
+#         name="tests hello",
 #         usePTY=True,
-#         command=["sh", "-c", "cd src/monkey; ../../contrib/timeout_watchdog 
600 make check; "],
-#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})    
-
-f_moep = factory.BuildFactory()
-f_moep.addStep(source.SVN(mode='update', svnurl = 
"https://gnunet.org/svn/gnunet/";))
-f_moep.addStep(shell.ShellCommand,command=["sh", "-c", "killall_gnunet || 
true; svn -R revert *"],
-        description="cleanup old processes",
-        name="cleanup",
-        haltOnFailure=False)
-f_moep.addStep(shell.ShellCommand,command=["sh", "-c", "./bootstrap"],
-        description="bootstrap",
-        name="bootstrap",
-        haltOnFailure=True)
-f_moep.addStep(shell.Configure,command=["sh", "-c", 
"CPPFLAGS=\"-I/opt/local/include\" LDFLAGS=\"-L/opt/local/lib\" ./configure 
--enable-benchmarks --enable-expensive-tests  --prefix=/tmp/gnunet_build 
--with-extractor=/opt/local/lib --with-qt=/c/Qt/4.4.0"],
-        description="configure",
-        name="configure",
-        haltOnFailure=True)
-f_moep.addStep(shell.Compile,command=["sh", "-c", "make install"])
-f_moep.addStep(shell.ShellCommand, description=["tests util"],
-       name="tests util",
-       usePTY=True,
-       command=["sh", "-c", "cd src/util; make check; "],
-       env={'LDFLAGS'  : '-L/opt/local' , 'GNUNET_PREFIX': '/tmp/gnunet_build' 
, 'PATH': "/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests block"],
-          name="tests block",
-          usePTY=True,
-          command=["sh", "-c", "cd src/block; ../../contrib/timeout_watchdog 
600 make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests statistics"],
-          name="tests statistics",
-          usePTY=True,
-          command=["sh", "-c", "cd src/statistics; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests arm"],
-          name="tests arm",
-          usePTY=True,
-          command=["sh", "-c", "cd src/arm; ../../contrib/timeout_watchdog 600 
make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests hello"],
-          name="tests hello",
-          usePTY=True,
-          command=["sh", "-c", "cd src/hello; ../../contrib/timeout_watchdog 
600 make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests peerinfo"],
-          name="tests peerinfo",
-          usePTY=True,
-          command=["sh", "-c", "cd src/peerinfo; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests datacache"],
-          name="tests datacache",
-          usePTY=True,
-          command=["sh", "-c", "cd src/datacache; 
../../contrib/timeout_watchdog 900 make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests datastore"],
-          name="tests datastore",
-          usePTY=True,
-          command=["sh", "-c", "cd src/datastore; 
../../contrib/timeout_watchdog 1800 make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests template"],
-          name="tests template",
-          usePTY=True,
-          command=["sh", "-c", "cd src/template; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests fragmentation"],
-          name="tests fragmentation",
-          usePTY=True,
-          command=["sh", "-c", "cd src/fragmentation; 
../../contrib/timeout_watchdog 3600 make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests transport"],
-          name="tests transport",
-          usePTY=True,
-          command=["sh", "-c", "rm -rf /tmp/test-transport; cd src/transport; 
../../contrib/timeout_watchdog 7200 make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests peerinfo-tool"],
-          name="tests peerinfo-tool",
-          usePTY=True,
-          command=["sh", "-c", "cd src/peerinfo-tool; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests core"],
-          name="tests core",
-          usePTY=True,
-          command=["sh", "-c", "cd src/core; ../../contrib/timeout_watchdog 
1800 make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests testing"],
-          name="tests testing",
-          usePTY=True,
-          command=["sh", "-c", "cd src/testing; ../../contrib/timeout_watchdog 
1800 make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand,description=["tests nse"],
-          name="tests nse",
-          usePTY=True,
-          command=["sh", "-c", "cd src/nse; ../../contrib/timeout_watchdog 
1800 make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests dht"],
-          name="tests dht",
-          usePTY=True,
-          command=["sh", "-c", "cd src/dht; ../../contrib/timeout_watchdog 
1800 make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests hostlist"],
-          name="tests hostlist",
-          usePTY=True,
-          command=["sh", "-c", "cd src/hostlist; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests topology"],
-          name="tests topology",
-          usePTY=True,
-          command=["sh", "-c", "cd src/topology; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests nat"],
-          name="tests nat",
-          usePTY=True,
-          command=["sh", "-c", "cd src/nat; ../../contrib/timeout_watchdog 600 
make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests fs"],
-          name="tests fs",
-          usePTY=True,
-          command=["sh", "-c", "cd src/fs; ../../contrib/timeout_watchdog 3800 
make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests mesh"],
-          name="tests mesh",
-          usePTY=True,
-          command=["sh", "-c", "cd src/mesh; ../../contrib/timeout_watchdog 
600 make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-f_moep.addStep(shell.ShellCommand, description=["tests vpn"],
-          name="tests vpn",
-          usePTY=True,
-          command=["sh", "-c", "cd src/vpn; ../../contrib/timeout_watchdog 600 
make check; "],
-          env={'GNUNET_PREFIX': '/tmp/gnunet_build' , 'PATH': 
"/tmp/gnunet_build" + "/bin:/bin:" + os.environ['PATH']})
-
-f_test = factory.BuildFactory()
-f_test.addStep(source.SVN(mode='update', svnurl = 
"https://gnunet.org/svn/gnunet/";))
-f_test.addStep(shell.ShellCommand, command=["sh", "-c", "killall 
gnunet-service-arm || true; svn -R revert *; rm -rf /tmp/gnunet*; rm -rf 
/tmp/test*;"],
-        description="clean up from previous runs",
-        name="killall",
-        haltOnFailure=False,
-       timeout=180)
-f_test.addStep(shell.ShellCommand, command=["sh", "-c", "./bootstrap"],
-      description="bootstrap",
-      name="bootstrap",
-      haltOnFailure=True)
-f_test.addStep(shell.Configure, command=["sh", "-c", "./configure 
--enable-benchmarks --enable-expensive-tests --prefix=" + tmp + " 
--with-extractor=/usr/local --with-mysql=/usr/local 
--with-microhttpd=/usr/local --with-mysql=/usr/local --with-postgres=/usr/local 
--with-libintl-prefix=/usr/local --with-iconv-prefix=/usr/local 
--with-ltdl-include=/usr/local/include --with-ltdl-lib=/usr/local/lib"],
-        description="configure",
-        name="configure",
-        haltOnFailure=True)
-f_test.addStep(shell.Compile, command=["sh", "-c", "make install"])
-f_test.addStep(shell.ShellCommand,description=["tests util"],
-          name="tests util",
-          usePTY=True,
-          command=["sh", "-c", "cd src/util; 
../../../contrib/../../contrib/timeout_watchdog 900 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand, description=["tests block"],
-          name="tests block",
-          usePTY=True,
-          command=["sh", "-c", "cd src/block; ../../contrib/timeout_watchdog 
600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand, description=["tests statistics"],
-          name="tests statistics",
-          usePTY=True,
-          command=["sh", "-c", "cd src/statistics; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand,description=["tests arm"],
-          name="tests arm",
-          usePTY=True,
-          command=["sh", "-c", "cd src/arm; ../../contrib/timeout_watchdog 600 
make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand,description=["tests hello"],
-          name="tests hello",
-          usePTY=True,
-          command=["sh", "-c", "cd src/hello; ../../contrib/timeout_watchdog 
600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand,description=["tests peerinfo"],
-          name="tests peerinfo",
-          usePTY=True,
-          command=["sh", "-c", "cd src/peerinfo; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand,description=["tests datacache"],
-          name="tests datacache",
-          usePTY=True,
-          command=["sh", "-c", "cd src/datacache; 
../../contrib/timeout_watchdog 900 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand,description=["tests datastore"],
-          name="tests datastore",
-          usePTY=True,
-          command=["sh", "-c", "cd src/datastore; 
../../contrib/timeout_watchdog 1800 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand,description=["tests template"],
-          name="tests template",
-          usePTY=True,
-          command=["sh", "-c", "cd src/template; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand, description=["tests fragmentation"],
-          name="tests fragmentation",
-          usePTY=True,
-          command=["sh", "-c", "cd src/fragmentation; 
../../contrib/timeout_watchdog 3600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand,description=["tests transport"],
-          name="tests transport",
-          usePTY=True,
-          command=["sh", "-c", "rm -rf /tmp/test-transport; cd src/transport; 
../../contrib/timeout_watchdog 7200 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']},
-          timeout=7200)
-f_test.addStep(shell.ShellCommand,description=["tests peerinfo-tool"],
-          name="tests peerinfo-tool",
-          usePTY=True,
-          command=["sh", "-c", "cd src/peerinfo-tool; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand,description=["tests core"],
-          name="tests core",
-          usePTY=True,
-          command=["sh", "-c", "cd src/core; ../../contrib/timeout_watchdog 
1800 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand,description=["tests testing"],
-          name="tests testing",
-          usePTY=True,
-          command=["sh", "-c", "cd src/testing; ../../contrib/timeout_watchdog 
1800 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand,description=["tests nse"],
-          name="tests nse",
-          usePTY=True,
-          command=["sh", "-c", "cd src/nse; ../../contrib/timeout_watchdog 
1800 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand,description=["tests dht"],
-          name="tests dht",
-          usePTY=True,
-          command=["sh", "-c", "cd src/dht; ../../contrib/timeout_watchdog 
1800 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand,description=["tests hostlist"],
-          name="tests hostlist",
-          usePTY=True,
-          command=["sh", "-c", "cd src/hostlist; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand,description=["tests topology"],
-          name="tests topology",
-          usePTY=True,
-          command=["sh", "-c", "cd src/topology; 
../../contrib/timeout_watchdog 600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand,description=["tests nat"],
-          name="tests nat",
-          usePTY=True,
-          command=["sh", "-c", "cd src/nat; ../../contrib/timeout_watchdog 600 
make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand,description=["tests fs"],
-          name="tests fs",
-          usePTY=True,
-          command=["sh", "-c", "cd src/fs; ../../contrib/timeout_watchdog 3800 
make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand, description=["tests mesh"],
-          name="tests mesh",
-          usePTY=True,
-          command=["sh", "-c", "cd src/mesh; ../../contrib/timeout_watchdog 
600 make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-f_test.addStep(shell.ShellCommand, description=["tests vpn"],
-          name="tests vpn",
-          usePTY=True,
-          command=["sh", "-c", "cd src/vpn; ../../contrib/timeout_watchdog 600 
make check; "],
-          env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-#f_test.addStep(shell.ShellCommand, description=["tests monkey"],
+#         command=["sh", "-c", "cd src/hello; ../../contrib/timeout_watchdog 
600 make check; "],
+#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
+#f1.addStep(shell.ShellCommand, description=["tests peerinfo"],
+#         name="tests peerinfo",
+#         usePTY=True,
+#         command=["sh", "-c", "cd src/peerinfo; 
../../contrib/timeout_watchdog 600 make check; "],
+#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
+#f1.addStep(shell.ShellCommand, description=["tests datacache"],
+#         name="tests datacache",
+#         usePTY=True,
+#         command=["sh", "-c", "cd src/datacache; 
../../contrib/timeout_watchdog 900 make check; "],
+#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
+#f1.addStep(shell.ShellCommand, description=["tests datastore"],
+#         name="tests datastore",
+#         usePTY=True,
+#         command=["sh", "-c", "cd src/datastore; 
../../contrib/timeout_watchdog 1800 make check; "],
+#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
+#f1.addStep(shell.ShellCommand, description=["tests template"],
+#         name="tests template",
+#         usePTY=True,
+#         command=["sh", "-c", "cd src/template; 
../../contrib/timeout_watchdog 3600 make check; "],
+#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
+#f1.addStep(shell.ShellCommand, description=["tests fragmentation"],
+#         name="tests fragmentation",
+#         usePTY=True,
+#         command=["sh", "-c", "cd src/fragmentation; 
../../contrib/timeout_watchdog 3600 make check; "],
+#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
+#f1.addStep(shell.ShellCommand, description=["tests transport"],
+#         name="tests transport",
+#         usePTY=True,
+#         command=["sh", "-c", "rm -rf /tmp/test-transport; cd src/transport; 
../../contrib/timeout_watchdog 7200 make check; "],
+#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']},
+#         timeout=7200)
+#f1.addStep(shell.ShellCommand, description=["tests peerinfo-tool"],
+#         name="tests peerinfo-tool",
+#         usePTY=True,
+#         command=["sh", "-c", "cd src/peerinfo-tool; 
../../contrib/timeout_watchdog 600 make check; "],
+#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
+#f1.addStep(shell.ShellCommand, description=["tests core"],
+#         name="tests core",
+#         usePTY=True,
+#         command=["sh", "-c", "cd src/core; ../../contrib/timeout_watchdog 
1800 make check; "],
+#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
+#f1.addStep(shell.ShellCommand, description=["tests testing"],
+#         name="tests testing",
+#         usePTY=True,
+#         command=["sh", "-c", "cd src/testing; ../../contrib/timeout_watchdog 
1800 make check; "],
+#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
+#f1.addStep(shell.ShellCommand,description=["tests nse"],
+#         name="tests nse",
+#         usePTY=True,
+#         command=["sh", "-c", "cd src/nse; ../../contrib/timeout_watchdog 
1800 make check; "],
+#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
+#f1.addStep(shell.ShellCommand, description=["tests dht"],
+#         name="tests dht",
+#         usePTY=True,
+#         command=["sh", "-c", "cd src/dht; make check; "],
+#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
+#f1.addStep(shell.ShellCommand, description=["tests hostlist"],
+#         name="tests hostlist",
+#         usePTY=True,
+#         command=["sh", "-c", "cd src/hostlist; 
../../contrib/timeout_watchdog 600 make check; "],
+#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
+#f1.addStep(shell.ShellCommand, description=["tests topology"],
+#         name="tests topology",
+#         usePTY=True,
+#         command=["sh", "-c", "cd src/topology; 
../../contrib/timeout_watchdog 600 make check; "],
+#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
+#f1.addStep(shell.ShellCommand, description=["tests nat"],
+#         name="tests nat",
+#         usePTY=True,
+#         command=["sh", "-c", "cd src/nat; ../../contrib/timeout_watchdog 600 
make check; "],
+#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
+#f1.addStep(shell.ShellCommand, description=["tests fs"],
+#         name="tests fs",
+#         usePTY=True,
+#         command=["sh", "-c", "cd src/fs; ../../contrib/timeout_watchdog 3800 
make check; "],
+#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
+#f1.addStep(shell.ShellCommand, description=["tests mesh"],
+#         name="tests mesh",
+#         usePTY=True,
+#         command=["sh", "-c", "cd src/mesh; ../../contrib/timeout_watchdog 
600 make check; "],
+#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
+#f1.addStep(shell.ShellCommand, description=["tests vpn"],
+#         name="tests vpn",
+#         usePTY=True,
+#         command=["sh", "-c", "cd src/vpn; ../../contrib/timeout_watchdog 600 
make check; "],
+#         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
+##f1.addStep(shell.ShellCommand, description=["tests monkey"],
 #         name="tests monkey",
 #         usePTY=True,
 #         command=["sh", "-c", "cd src/monkey; ../../contrib/timeout_watchdog 
600 make check; "],
 #         env={'GNUNET_PREFIX': tmp, 'PATH': tmp + "/bin:/bin:" + 
os.environ['PATH']})
-                                                                               
            
-# %PATH% and %LE_PREFIX% have to be set before buildbot startup
-fLEXP = factory.BuildFactory()
-fLEXP.addStep(source.SVN(mode='update', svnurl = 
"https://gnunet.org/svn/Extractor/";))
-fLEXP.addStep(shell.ShellCommand,command=["sh", "-c", "killall_gnunet"],
-        description="cleanup old processes",
-       name="cleanup",
-       haltOnFailure=False)
-fLEXP.addStep(shell.ShellCommand,command=["sh", "-c", "./bootstrap"],
-        description="bootstrap",
-         name="bootstrap",
-         haltOnFailure=True)
-fLEXP.addStep(shell.Configure,command=["sh", "-c", "./configure --disable-nls 
--prefix=$LE_PREFIX --with-qt=/c/Qt/4.4.0"],
-        description="configure",
-        name="configure",
-        haltOnFailure=True)
-fLEXP.addStep(shell.Compile,command=["sh", "-c", "make install"])
-fLEXP.addStep(shell.ShellCommand, description=["tests"],
-       name="tests",
-        usePTY=True,
-        command=["sh", "-c", "make check; "])
 
 
-
 b0= {
-'name':"planetlab-3.fing.edu.uy",
-'slavename':"planetlab-3.fing.edu.uy"
-'builddir':"full",
+'name':"planetlab1.cs.vu.nl",
+'slavename':"planetlab1.cs.vu.nl",
+'builddir':"planetlab1.cs.vu.nl",
 'factory':f1,
 'category':"Gnunet",
 } 
 b1= {
-'name':"planetlab1.comp.nus.edu.sg",
-'slavename':"planetlab1.comp.nus.edu.sg"
-'builddir':"full",
+'name':"plewifi.ipv6.lip6.fr",
+'slavename':"plewifi.ipv6.lip6.fr",
+'builddir':"plewifi.ipv6.lip6.fr",
 'factory':f1,
 'category':"Gnunet",
 } 
+b2= {
+'name':"planetlab1.otemachi.wide.ad.jp",
+'slavename':"planetlab1.otemachi.wide.ad.jp",
+'builddir':"planetlab1.otemachi.wide.ad.jp",
+'factory':f1,
+'category':"Gnunet",
+} 
+b3= {
+'name':"planetlab2.pjwstk.edu.pl",
+'slavename':"planetlab2.pjwstk.edu.pl",
+'builddir':"planetlab2.pjwstk.edu.pl",
+'factory':f1,
+'category':"Gnunet",
+} 
 
 
-
 c['builders'] = [
-#c['builders'] = [b0, b12, b19, b20, b21, b22, b23, b24]
-               
+
+
 b0,
-b1
-               ]
+b1,
+b2,
+b3
 
+]
+
 ####### STATUS TARGETS
 
 # 'status' is a list of Status Targets. The results of each build will be
@@ -1130,8 +314,8 @@
 c['status'] = []
 
 from buildbot.status import html
-#c['status'].append(html.WebStatus(http_port=8010))
-c['status'].append(html.WebStatus(http_port=8010, allowForce=True))
+#c['status'].append(html.WebStatus(http_port=8011))
+c['status'].append(html.WebStatus(http_port=8011, allowForce=True))
 
 # from buildbot.status import mail
 # c['status'].append(mail.MailNotifier(fromaddr="address@hidden",
@@ -1182,5 +366,4 @@
 # with an externally-visible host name which the buildbot cannot figure out
 # without some help.
 
-c['buildbotURL'] = "http://localhost:8010/";
-
+c['buildbotURL'] = "http://gnunet.org:8011/";

Modified: gnunet-planetlab/config_generator/master_config_generate.sh
===================================================================
--- gnunet-planetlab/config_generator/master_config_generate.sh 2012-03-13 
10:30:03 UTC (rev 20473)
+++ gnunet-planetlab/config_generator/master_config_generate.sh 2012-03-13 
12:00:18 UTC (rev 20474)
@@ -16,7 +16,7 @@
 replace_str="$replace_str\n$temp_var"
 var2=$((var2-1))
 done
-echo $replace_str
+#echo $replace_str
 sed "s/replace1/$replace_str/g" master_template.cfg > temp; mv temp master.cfg;
 
 
@@ -26,7 +26,7 @@
 if [ $var2 = 0 ]
 then
 temp_var="$i""_pass"
-echo $temp_var
+#echo $temp_var
 else
 sed "s/$temp_var/$i/g" master.cfg > temp; mv temp master.cfg;
 fi
@@ -56,7 +56,7 @@
 #echo $replace_str
 var2=$((var2-1))
 done
-echo $replace_str
+#echo $replace_str
 sed "s/replace2/$replace_str/g" master.cfg > temp; mv temp master.cfg;
 
 
@@ -73,7 +73,7 @@
 var2=$((var2-1))
 var3=$((var3+1))
 done
-echo $replace_str
+#echo $replace_str
 sed "s/replace3/$replace_str/g" master.cfg > temp; mv temp master.cfg;
 
 
@@ -96,5 +96,5 @@
 var3=$((var3+1))
 done
 
-echo $replace_str
+#echo $replace_str
 sed "s/replace4/$replace_str/g" master.cfg > temp; mv temp master.cfg;

Modified: gnunet-planetlab/config_generator/master_restart.sh
===================================================================
--- gnunet-planetlab/config_generator/master_restart.sh 2012-03-13 10:30:03 UTC 
(rev 20473)
+++ gnunet-planetlab/config_generator/master_restart.sh 2012-03-13 12:00:18 UTC 
(rev 20474)
@@ -1,4 +1,5 @@
-cd pritpal
+cd ~/pritpal
 cp ../master.cfg ./
 buildbot stop
 buildbot start
+cd -

Modified: gnunet-planetlab/config_generator/nodes.txt
===================================================================
--- gnunet-planetlab/config_generator/nodes.txt 2012-03-13 10:30:03 UTC (rev 
20473)
+++ gnunet-planetlab/config_generator/nodes.txt 2012-03-13 12:00:18 UTC (rev 
20474)
@@ -1,5 +1,4 @@
-planetlab1.exp-math.uni-essen.de
-onelab-2.fhi-fokus.de
-planet2.inf.tu-dresden.de
-merkur.planetlab.haw-hamburg.de
-planetlab3.informatik.uni-erlangen.de
+planetlab1.cs.vu.nl
+plewifi.ipv6.lip6.fr
+planetlab1.otemachi.wide.ad.jp
+planetlab2.pjwstk.edu.pl

Modified: gnunet-planetlab/config_generator/nodes_password.txt
===================================================================
--- gnunet-planetlab/config_generator/nodes_password.txt        2012-03-13 
10:30:03 UTC (rev 20473)
+++ gnunet-planetlab/config_generator/nodes_password.txt        2012-03-13 
12:00:18 UTC (rev 20474)
@@ -1,2 +1,4 @@
-planetlab-3.fing.edu.uy b5Bp0VPRb8MrQ
-planetlab1.comp.nus.edu.sg QLIYmvec5dS0c
+planetlab1.cs.vu.nl PGoJWo..Fd5H.
+plewifi.ipv6.lip6.fr IknbM1KUl5W3c
+planetlab1.otemachi.wide.ad.jp da1jyYxWiOzyM
+planetlab2.pjwstk.edu.pl s7S9gUkQIw3O6

Modified: gnunet-planetlab/config_generator/password.txt
===================================================================
--- gnunet-planetlab/config_generator/password.txt      2012-03-13 10:30:03 UTC 
(rev 20473)
+++ gnunet-planetlab/config_generator/password.txt      2012-03-13 12:00:18 UTC 
(rev 20474)
@@ -1,2 +1,4 @@
-b5Bp0VPRb8MrQ
-QLIYmvec5dS0c
+PGoJWo..Fd5H.
+IknbM1KUl5W3c
+da1jyYxWiOzyM
+s7S9gUkQIw3O6

Modified: gnunet-planetlab/config_generator/password_generate.sh
===================================================================
--- gnunet-planetlab/config_generator/password_generate.sh      2012-03-13 
10:30:03 UTC (rev 20473)
+++ gnunet-planetlab/config_generator/password_generate.sh      2012-03-13 
12:00:18 UTC (rev 20474)
@@ -2,13 +2,17 @@
 
 #flushing previous passwords
 rm -rf nodes_password.txt
+rm -rf nodes_password_temp.txt
 rm -rf password.txt
+rm -rf password_temp.txt
 
 #Generate password for all nodes
 var=`cat nodes.txt`
 for i in $var; do
-var2=$(mkpasswd $i)
+var2=$(perl mkpasswd.txt $i)
 var3=$(echo "$var2"|tr -d //)
-echo "$var3" >> password.txt
-echo "$i $var3" >> nodes_password.txt
+echo "$var3" >> password_temp.txt
+echo "$i $var3" >> nodes_password_temp.txt
 done
+awk '{print $3}' password_temp.txt >> password.txt
+awk '{print $1 " " $4}' nodes_password_temp.txt >> nodes_password.txt

Added: gnunet-planetlab/config_generator/pre_run.sh
===================================================================
--- gnunet-planetlab/config_generator/pre_run.sh                                
(rev 0)
+++ gnunet-planetlab/config_generator/pre_run.sh        2012-03-13 12:00:18 UTC 
(rev 20474)
@@ -0,0 +1,4 @@
+echo "Determenining working nodes . . ."
+pssh -O StrictHostKeychecking=no -t 100 -p 10 -v -l tum_dht_testing -h 
add_nodes.txt -P date > temp_nodes.txt
+grep SUCCESS temp_nodes.txt | awk '{print $4}' > nodes.txt
+rm -rf temp_nodes.txt


Property changes on: gnunet-planetlab/config_generator/pre_run.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: gnunet-planetlab/config_generator/run.sh
===================================================================
--- gnunet-planetlab/config_generator/run.sh    2012-03-13 10:30:03 UTC (rev 
20473)
+++ gnunet-planetlab/config_generator/run.sh    2012-03-13 12:00:18 UTC (rev 
20474)
@@ -1,10 +1,15 @@
 rm -rf *.de*
 rm -rf hosts
+rm -rf planetlab-automation.log
+. ./remove_prev_buildslave_script.sh
+. ./pre_run.sh
 . ./password_generate.sh
 . ./master_config_generate.sh
-scp master.cfg address@hidden:.
-scp master_restart.sh address@hidden:.
-ssh address@hidden . ./master_restart.sh
+#scp master.cfg address@hidden:.
+#scp master_restart.sh address@hidden:.
+cp -rf master.cfg ~/
+. ./master_restart.sh
 #. ./setup_buildslave.sh
 #. ./nodes_create.sh
 . ./setup_buildslave_parallel.sh
+. ./remove_prev_buildslave_script.sh

Modified: gnunet-planetlab/config_generator/setup_buildslave_parallel.sh
===================================================================
--- gnunet-planetlab/config_generator/setup_buildslave_parallel.sh      
2012-03-13 10:30:03 UTC (rev 20473)
+++ gnunet-planetlab/config_generator/setup_buildslave_parallel.sh      
2012-03-13 12:00:18 UTC (rev 20474)
@@ -1,43 +1,46 @@
 #!/bin/sh
 #setup_buildslave.sh
-
+var_pssh="-p 10 -v -l tum_dht_testing -h nodes.txt -P"
+var_pscp="-p 10 -v -l tum_dht_testing -h nodes.txt"
+var_pssh_time="-t 0 -p 10 -v -l tum_dht_testing -h nodes.txt -P"
 . ./buildslave_start.sh
 echo "Installing Certificate"
-parallel-ssh -p 10 -v -l tum_dht_testing -h nodes.txt -P sudo yum install svn 
-y 
-parallel-scp -p 10 -v -l tum_dht_testing -h nodes.txt  
00_planetlab-certificate-install.sh /home/tum_dht_testing/
-parallel-scp -p 10 -v -l tum_dht_testing -h nodes.txt  gnunet-svn-cert 
/home/tum_dht_testing/
+pssh $var_pssh sudo yum install svn -y >> planetlab-automation.log
+pssh $var_pssh sudo rm -rf 00_planetlab-certificate-install.sh >> 
planetlab-automation.log
+pscp $var_pscp  00_planetlab-certificate-install.sh /home/tum_dht_testing/ >> 
planetlab-automation.log
+pscp $var_pscp  gnunet-svn-cert /home/tum_dht_testing/ >> 
planetlab-automation.log
 echo "Removing GNUnetDist"
-parallel-ssh -p 10 -v -l tum_dht_testing -h nodes.txt -P sudo rm -rf GNUnetDist
+pssh $var_pssh_time sudo rm -rf GNUnetDist >> planetlab-automation.log
 echo "Installing planetlab certificate"
-parallel-ssh -p 10 -v -l tum_dht_testing -h nodes.txt -P . 
./00_planetlab-certificate-install.sh
+pssh $var_pssh_time . ./00_planetlab-certificate-install.sh >> 
planetlab-automation.log
 echo "removing prev. redundant files"
-parallel-ssh -p 10 -v -l tum_dht_testing -h nodes.txt -P . 
./gnunet-planetlab/00_planetlab-remove.sh
+pssh $var_pssh_time . ./gnunet-planetlab/00_planetlab-remove.sh >> 
planetlab-automation.log
 echo "Installing dependencies"
-parallel-ssh -t -1 -p 10 -v -l tum_dht_testing -h nodes.txt -P . 
./gnunet-planetlab/01_planetlab-dependencies.sh
+pssh $var_pssh_time . ./gnunet-planetlab/01_planetlab-dependencies.sh >> 
planetlab-automation.log
 echo "Installing dep. from source"
-parallel-ssh -t -1 -p 10 -v -l tum_dht_testing -h nodes.txt -P . 
./gnunet-planetlab/02_planetlab-deps-from-source.sh
+pssh $var_pssh_time . ./gnunet-planetlab/02_planetlab-deps-from-source.sh >> 
planetlab-automation.log
 echo "Installing Extractor"
-parallel-ssh -t -1 -p 10 -v -l tum_dht_testing -h nodes.txt -P . 
./gnunet-planetlab/03_planetlab-extractor.sh
+pssh $var_pssh_time . ./gnunet-planetlab/03_planetlab-extractor.sh >> 
planetlab-automation.log
 echo "Installing libmicrohttpd"
-parallel-ssh -t -1 -p 10 -v -l tum_dht_testing -h nodes.txt -P . 
./gnunet-planetlab/04_planetlab-libmicrohttpd.sh
+pssh $var_pssh_time . ./gnunet-planetlab/04_planetlab-libmicrohttpd.sh >> 
planetlab-automation.log
 echo "Installing gnunet"
-parallel-ssh -t -1 -p 10 -v -l tum_dht_testing -h nodes.txt -P . 
./gnunet-planetlab/05_planetlab-gnunet.sh
+pssh $var_pssh_time . ./gnunet-planetlab/05_planetlab-gnunet.sh >> 
planetlab-automation.log
 echo "setting the environment"
-parallel-ssh -p 10 -v -l tum_dht_testing -h nodes.txt -P . 
./gnunet-planetlab/06_set_env.sh
+pssh $var_pssh . ./gnunet-planetlab/06_set_env.sh >> planetlab-automation.log
 echo "Installing Buildslave ..."
-parallel-ssh -t -1 -p 10 -v -l tum_dht_testing -h nodes.txt -P cp 
./gnunet-planetlab/doc/buildslave_installation.notes 
./buildslave_installation.sh
-parallel-ssh -p 10 -v -l tum_dht_testing -h nodes.txt -P sudo killall -9 
buildslave
-parallel-ssh -p 10 -v -l  tum_dht_testing -h nodes.txt -P . 
./buildslave_installation.sh
+pssh $var_pssh_time cp ./gnunet-planetlab/doc/buildslave_installation.notes 
./buildslave_installation.sh >> planetlab-automation.log
+pssh $var_pssh -P sudo killall -9 buildslave >> planetlab-automation.log
+pssh $var_pssh . ./buildslave_installation.sh >> planetlab-automation.log
 echo "setting configuration"
-parallel-ssh -p 10 -v -l tum_dht_testing -h nodes.txt -P mkdir 
/home/tum_dht_testing/.gnunet/
-parallel-ssh -p 10 -v -l tum_dht_testing -h nodes.txt -P touch 
/home/tum_dht_testing/.gnunet/gnunet.conf
-parallel-ssh -p 10 -v -l tum_dht_testing -h nodes.txt -P mkdir 
/home/tum_dht_testing/gnbuild/
-parallel-ssh -p 10 -v -l tum_dht_testing -h nodes.txt -P mkdir 
/home/tum_dht_testing/gnbuild/bin/
+pssh $var_pssh mkdir /home/tum_dht_testing/.gnunet/ >> planetlab-automation.log
+pssh $var_pssh touch /home/tum_dht_testing/.gnunet/gnunet.conf >> 
planetlab-automation.log
+pssh $var_pssh mkdir /home/tum_dht_testing/gnbuild/ >> planetlab-automation.log
+pssh $var_pssh mkdir /home/tum_dht_testing/gnbuild/bin/ >> 
planetlab-automation.log
 
 var=`cat nodes.txt`
 for i in $var; do
-ssh address@hidden  sudo rm -rf ./$i/
-scp $i.sh address@hidden:.
-ssh address@hidden . ./$i.sh
-echo "Starting buildslave on $i"
+ssh address@hidden  sudo rm -rf ./$i/ >> planetlab-automation.log
+scp $i.sh address@hidden:. >> planetlab-automation.log
+ssh address@hidden . ./$i.sh >> planetlab-automation.log
+echo "Starting buildslave on $i" >> planetlab-automation.log
 done

Modified: gnunet-planetlab/planetlab-api/getnodes.py
===================================================================
--- gnunet-planetlab/planetlab-api/getnodes.py  2012-03-13 10:30:03 UTC (rev 
20473)
+++ gnunet-planetlab/planetlab-api/getnodes.py  2012-03-13 12:00:18 UTC (rev 
20474)
@@ -1,11 +1,3 @@
-'''
-Created on Jan 24, 2012
-Good information:
-http://www.planet-lab.org/doc/plc_api
-http://www.planet-lab.org/doc/plcapitut
address@hidden: mwachs
-'''
-
 #!/usr/bin/python
 import sys, os, urllib, xmlrpclib, socket
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]