[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29080 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29080 - gnunet/src/testbed |
Date: |
Fri, 6 Sep 2013 18:48:58 +0200 |
Author: LRN
Date: 2013-09-06 18:48:58 +0200 (Fri, 06 Sep 2013)
New Revision: 29080
Modified:
gnunet/src/testbed/Makefile.am
gnunet/src/testbed/buildvars.py.in
gnunet/src/testbed/test_testbed_api_barriers.py
Log:
W32 compatibility for test_testbed_api_barriers
Modified: gnunet/src/testbed/Makefile.am
===================================================================
--- gnunet/src/testbed/Makefile.am 2013-09-06 14:38:24 UTC (rev 29079)
+++ gnunet/src/testbed/Makefile.am 2013-09-06 16:48:58 UTC (rev 29080)
@@ -367,7 +367,7 @@
$(top_builddir)/src/util/libgnunetutil.la \
libgnunettestbed.la
-do_subst = sed -e 's,address@hidden@],$(libexecdir),g'
+do_subst = sed -e 's,address@hidden@],$(libexecdir),g' -e
's,address@hidden@],$(exec_prefix),g'
buildvars.py: buildvars.py.in Makefile
$(do_subst) < $(srcdir)/buildvars.py.in > $@
Modified: gnunet/src/testbed/buildvars.py.in
===================================================================
--- gnunet/src/testbed/buildvars.py.in 2013-09-06 14:38:24 UTC (rev 29079)
+++ gnunet/src/testbed/buildvars.py.in 2013-09-06 16:48:58 UTC (rev 29080)
@@ -21,4 +21,14 @@
# brief: file for importing variables from build syste into python
# author: Sree Harsha Totakura
+import os
+
+exec_prefix = '@exec_prefix@'
libexecdir = '@libexecdir@'
+
+if libexecdir.startswith (exec_prefix):
+ libexecdir = libexecdir[len (exec_prefix):]
+
+gnunet_prefix = os.environ.get ('GNUNET_PREFIX', None)
+if gnunet_prefix and libexecdir.startswith ('/'):
+ libexecdir = os.path.join (gnunet_prefix, libexecdir[1:])
Modified: gnunet/src/testbed/test_testbed_api_barriers.py
===================================================================
--- gnunet/src/testbed/test_testbed_api_barriers.py 2013-09-06 14:38:24 UTC
(rev 29079)
+++ gnunet/src/testbed/test_testbed_api_barriers.py 2013-09-06 16:48:58 UTC
(rev 29080)
@@ -29,14 +29,18 @@
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'
-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)
+ret = subprocess.call (test_testbed_api_barriers, shell=False)
# remove the installed gnunet-service-test-barriers copy
os.unlink (os.path.join (libexecdir, service))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29080 - gnunet/src/testbed,
gnunet <=