- remove python wrapper for barriers test case

2 files changed, 5 insertions, 67 deletions

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 2cf13570d..71abf0459 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -2,8 +2,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
   WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
-else
-  TEST_API_BARRIERS= test_testbed_api_barriers.py
 endif
 
 if USE_COVERAGE
@@ -39,8 +37,8 @@ CLEANFILES = $(check_SCRIPTS) \
   buildvars.pyc
 
 noinst_PROGRAMS = \
-  gnunet-service-test-barriers \
-  test-getcwd
+  gnunet-service-test-barriers
+
 gnunet_service_testbed_SOURCES = \
   gnunet-service-testbed.h \
   gnunet-service-testbed.c \
@@ -193,7 +191,7 @@ if ENABLE_TEST_RUN
   test_testbed_api_testbed_run_topologysmallworldring \
   test_testbed_api_testbed_run_topologyfromfile \
   test_testbed_api_testbed_run_topologyscalefree \
-  $(TEST_API_BARRIERS)
+  test_testbed_api_barriers
 endif
 
 test_testbed_api_hosts_SOURCES = \
@@ -371,11 +369,6 @@ test_testbed_api_barriers_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la
 
-do_subst = sed -e 's,[@]libexecdir[@],$(libexecdir),g' -e 's,[@]exec_prefix[@],$(exec_prefix),g'
-
-buildvars.py: buildvars.py.in Makefile
-        $(do_subst) < $(srcdir)/buildvars.py.in > $@
-
 gnunet_service_test_barriers_SOURCES = \
   gnunet-service-test-barriers.c \
   test_testbed_api_barriers.h
@@ -395,10 +388,7 @@ EXTRA_DIST = \
   test_testbed_api_testbed_run_topologysmallworld.conf \
   test_testbed_api_testbed_run_topologyfromfile.conf \
   test_testbed_api_testbed_run_topologyscalefree.conf \
+  test_testbed_api_barriers.conf.in \
   overlay_topology.txt \
   sample_hosts.txt \
-  sample.job \
-  buildvars.py.in \
-  test_testbed_api_barriers.py
-
-test_getcwd_SOURCES = test_getcwd.c
\ No newline at end of file
+  sample.job
diff --git a/src/testbed/test_testbed_api_barriers.py b/src/testbed/test_testbed_api_barriers.py
deleted file mode 100755
index cc2a94743..000000000
--- a/src/testbed/test_testbed_api_barriers.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/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
-import os
-import sys
-from buildvars import libexecdir
-
-if os.name == 'nt':
-  service = 'gnunet-service-test-barriers.exe'
-  test_testbed_api_barriers = './test_testbed_api_barriers.exe'
-else:
-  service = 'gnunet-service-test-barriers'
-  test_testbed_api_barriers = './test_testbed_api_barriers'
-
-# copy gnunet-service-test-barriers service to gnunet's libexec dir
-ret = subprocess.call (['libtool', '--mode=install', 'install',
-                        service, libexecdir],
-                       shell=False, executable='libtool')
-if ret is not 0:
-    print "could not install test daemon"
-    sys.exit (ret);
-
-# 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)