- build system changes for testing barriers API

5 files changed, 163 insertions, 3 deletions

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index f07639b8a..4c204c4a8 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -30,6 +30,15 @@ bin_PROGRAMS = \
   $(ll_binaries) \
   gnunet-testbed-profiler
 
+noinst_SCRIPTS = \
+  buildvars.py
+
+CLEANFILES = $(noinst_SCRIPTS) \
+  buildvars.pyc
+
+noinst_PROGRAMS = \
+  gnunet-service-test-barriers
+
 gnunet_service_testbed_SOURCES = \
   gnunet-service-testbed.h \
   gnunet-service-testbed.c \
@@ -150,7 +159,8 @@ check_PROGRAMS = \
   test_testbed_api_testbed_run_topologyfromfile \
   test_testbed_api_testbed_run_topologyscalefree \
   test_testbed_api_testbed_run_waitforever \
-  test_testbed_api_statistics
+  test_testbed_api_statistics \
+  test_testbed_api_barriers
 
 if ENABLE_TEST_RUN
  TESTS = \
@@ -179,7 +189,8 @@ if ENABLE_TEST_RUN
   test_testbed_api_testbed_run_topologysmallworld \
   test_testbed_api_testbed_run_topologysmallworldring \
   test_testbed_api_testbed_run_topologyfromfile \
-  test_testbed_api_testbed_run_topologyscalefree
+  test_testbed_api_testbed_run_topologyscalefree \
+  test_testbed_api_barriers.py
 endif
 
 test_testbed_api_hosts_SOURCES = \
@@ -350,6 +361,23 @@ test_testbed_api_peer_reconfiguration_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la
 
+test_testbed_api_barriers_SOURCES = \
+ test_testbed_api_barriers.c
+test_testbed_api_barriers_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
+do_subst = sed -e 's,[@]libexecdir[@],$(libexecdir),g'
+
+buildvars.py: buildvars.py.in Makefile
+        $(do_subst) < $(srcdir)/buildvars.py.in > $@
+
+gnunet_service_test_barriers_SOURCES = \
+  gnunet-service-test-barriers.c
+gnunet_service_test_barriers_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunettestbed.la
+
 EXTRA_DIST = \
   test_testbed_api.conf \
   test_testbed_api_test_timeout.conf \
@@ -364,4 +392,6 @@ EXTRA_DIST = \
   test_testbed_api_testbed_run_topologyscalefree.conf \
   overlay_topology.txt \
   sample_hosts.txt \
-  sample.job
+  sample.job \
+  buildvars.py.in \
+  test_testbed_api_barriers.py
diff --git a/src/testbed/buildvars.py.in b/src/testbed/buildvars.py.in
new file mode 100644
index 000000000..e1b7d7666
--- /dev/null
+++ b/src/testbed/buildvars.py.in
@@ -0,0 +1,24 @@
+# This file is part of GNUnet.
+# (C) 2008--2013 Christian Grothoff (and other contributing authors)
+#
+# GNUnet is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published
+# by the Free Software Foundation; either version 2, or (at your
+# option) any later version.
+#
+# GNUnet is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNUnet; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+
+# file:     testbed/buildvars.py
+# brief:    file for importing variables from build syste into python
+# author:   Sree Harsha Totakura
+
+libexecdir = '@libexecdir@'
diff --git a/src/testbed/gnunet-service-test-barriers.c b/src/testbed/gnunet-service-test-barriers.c
new file mode 100644
index 000000000..6c43ad4b3
--- /dev/null
+++ b/src/testbed/gnunet-service-test-barriers.c
@@ -0,0 +1,32 @@
+/*
+      This file is part of GNUnet
+      (C) 2008--2013 Christian Grothoff (and other contributing authors)
+
+      GNUnet is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published
+      by the Free Software Foundation; either version 3, or (at your
+      option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      General Public License for more details.
+
+      You should have received a copy of the GNU General Public License
+      along with GNUnet; see the file COPYING.  If not, write to the
+      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+      Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * @file testbed/gnunet-service-test-barriers.c
+ * @brief Service for testing testbed barriers.  This service is started as a
+ *   peer service and waits for a barrier to be crossed.
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ */
+
+
+int main ()
+{
+  return 0;
+}
diff --git a/src/testbed/test_testbed_api_barriers.c b/src/testbed/test_testbed_api_barriers.c
new file mode 100644
index 000000000..1e6a8012d
--- /dev/null
+++ b/src/testbed/test_testbed_api_barriers.c
@@ -0,0 +1,31 @@
+/*
+      This file is part of GNUnet
+      (C) 2008--2013 Christian Grothoff (and other contributing authors)
+
+      GNUnet is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published
+      by the Free Software Foundation; either version 3, or (at your
+      option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      General Public License for more details.
+
+      You should have received a copy of the GNU General Public License
+      along with GNUnet; see the file COPYING.  If not, write to the
+      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+      Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * @file testbed/test_testbed_api_barriers.c
+ * @brief testcase binary for testing testbed barriers API
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ */
+
+
+int main ()
+{
+  return 0;
+}
diff --git a/src/testbed/test_testbed_api_barriers.py b/src/testbed/test_testbed_api_barriers.py
new file mode 100755
index 000000000..97993a9dc
--- /dev/null
+++ b/src/testbed/test_testbed_api_barriers.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+# This file is part of GNUnet.
+# (C) 2008--2013 Christian Grothoff (and other contributing authors)
+#
+# GNUnet is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published
+# by the Free Software Foundation; either version 2, or (at your
+# option) any later version.
+#
+# GNUnet is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNUnet; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+
+# file:     testbed/test_testbed_api_barriers.py
+# brief:    execution script for testing testbed barriers API.
+# author:   Sree Harsha Totakura
+
+
+import subprocess as sp
+import shutil
+import os
+from buildvars import libexecdir
+
+
+service = 'gnunet-service-test-barriers'
+
+# copy gnunet-service-test-barriers service to gnunet's libexec dir
+shutil.copy (service, libexecdir)
+
+# start the testcase binary
+ret = subprocess.call ('test_testbed_api_barriers', shell=False)
+
+# remove the installed gnunet-service-test-barriers copy
+os.unlink (os.path.join (libexecdir, service))
+
+sys.exit (ret)