[GNUnet-SVN] r19089 - gnunet-planetlab/config_generator

[gnunet]

Author: pritpal
Date: 2012-01-11 16:14:27 +0100 (Wed, 11 Jan 2012)
New Revision: 19089

Modified:
   gnunet-planetlab/config_generator/master_template.cfg
Log:
updated

Modified: gnunet-planetlab/config_generator/master_template.cfg
===================================================================
--- gnunet-planetlab/config_generator/master_template.cfg       2012-01-11 
15:13:54 UTC (rev 19088)
+++ gnunet-planetlab/config_generator/master_template.cfg       2012-01-11 
15:14:27 UTC (rev 19089)
@@ -139,118 +139,125 @@
        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"],
+
+f1.addStep(shell.Configure, command=["sh", "-c", "gnunet-arm -c 
~/.gnunet/gnunet.conf -s"],
+       description="starting gnunet-arm service",
+       name="gnunet-arm service",
+       haltOnFailure=True)
+
+
+#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",
 #         usePTY=True,
 #         command=["sh", "-c", "cd src/monkey; ../../contrib/timeout_watchdog 
600 make check; "],