diff options
author | LRN <lrn1986@gmail.com> | 2013-09-06 16:48:58 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2013-09-06 16:48:58 +0000 |
commit | 8f9923a6fb8a3034370e18579ab4aee00bbee1c6 (patch) | |
tree | 44adca2391c597ef2108b3e2045005d23159e0d7 | |
parent | 2ca4b8a208f6f910c819bbaa6785a25ae2955501 (diff) | |
download | gnunet-8f9923a6fb8a3034370e18579ab4aee00bbee1c6.tar.gz gnunet-8f9923a6fb8a3034370e18579ab4aee00bbee1c6.zip |
W32 compatibility for test_testbed_api_barriers
-rw-r--r-- | src/testbed/Makefile.am | 2 | ||||
-rw-r--r-- | src/testbed/buildvars.py.in | 10 | ||||
-rwxr-xr-x | src/testbed/test_testbed_api_barriers.py | 10 |
3 files changed, 18 insertions, 4 deletions
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am index 18d6a3ae9..b3779ec21 100644 --- a/src/testbed/Makefile.am +++ b/src/testbed/Makefile.am | |||
@@ -367,7 +367,7 @@ test_testbed_api_barriers_LDADD = \ | |||
367 | $(top_builddir)/src/util/libgnunetutil.la \ | 367 | $(top_builddir)/src/util/libgnunetutil.la \ |
368 | libgnunettestbed.la | 368 | libgnunettestbed.la |
369 | 369 | ||
370 | do_subst = sed -e 's,[@]libexecdir[@],$(libexecdir),g' | 370 | do_subst = sed -e 's,[@]libexecdir[@],$(libexecdir),g' -e 's,[@]exec_prefix[@],$(exec_prefix),g' |
371 | 371 | ||
372 | buildvars.py: buildvars.py.in Makefile | 372 | buildvars.py: buildvars.py.in Makefile |
373 | $(do_subst) < $(srcdir)/buildvars.py.in > $@ | 373 | $(do_subst) < $(srcdir)/buildvars.py.in > $@ |
diff --git a/src/testbed/buildvars.py.in b/src/testbed/buildvars.py.in index e1b7d7666..339945c20 100644 --- a/src/testbed/buildvars.py.in +++ b/src/testbed/buildvars.py.in | |||
@@ -21,4 +21,14 @@ | |||
21 | # brief: file for importing variables from build syste into python | 21 | # brief: file for importing variables from build syste into python |
22 | # author: Sree Harsha Totakura | 22 | # author: Sree Harsha Totakura |
23 | 23 | ||
24 | import os | ||
25 | |||
26 | exec_prefix = '@exec_prefix@' | ||
24 | libexecdir = '@libexecdir@' | 27 | libexecdir = '@libexecdir@' |
28 | |||
29 | if libexecdir.startswith (exec_prefix): | ||
30 | libexecdir = libexecdir[len (exec_prefix):] | ||
31 | |||
32 | gnunet_prefix = os.environ.get ('GNUNET_PREFIX', None) | ||
33 | if gnunet_prefix and libexecdir.startswith ('/'): | ||
34 | libexecdir = os.path.join (gnunet_prefix, libexecdir[1:]) | ||
diff --git a/src/testbed/test_testbed_api_barriers.py b/src/testbed/test_testbed_api_barriers.py index 9ee8c61ff..17b6ab1e5 100755 --- a/src/testbed/test_testbed_api_barriers.py +++ b/src/testbed/test_testbed_api_barriers.py | |||
@@ -29,14 +29,18 @@ import os | |||
29 | import sys | 29 | import sys |
30 | from buildvars import libexecdir | 30 | from buildvars import libexecdir |
31 | 31 | ||
32 | 32 | if os.name == 'nt': | |
33 | service = 'gnunet-service-test-barriers' | 33 | service = 'gnunet-service-test-barriers.exe' |
34 | test_testbed_api_barriers = './test_testbed_api_barriers.exe' | ||
35 | else: | ||
36 | service = 'gnunet-service-test-barriers' | ||
37 | test_testbed_api_barriers = './test_testbed_api_barriers' | ||
34 | 38 | ||
35 | # copy gnunet-service-test-barriers service to gnunet's libexec dir | 39 | # copy gnunet-service-test-barriers service to gnunet's libexec dir |
36 | shutil.copy (service, libexecdir) | 40 | shutil.copy (service, libexecdir) |
37 | 41 | ||
38 | # start the testcase binary | 42 | # start the testcase binary |
39 | ret = subprocess.call ('./test_testbed_api_barriers', shell=False) | 43 | ret = subprocess.call (test_testbed_api_barriers, shell=False) |
40 | 44 | ||
41 | # remove the installed gnunet-service-test-barriers copy | 45 | # remove the installed gnunet-service-test-barriers copy |
42 | os.unlink (os.path.join (libexecdir, service)) | 46 | os.unlink (os.path.join (libexecdir, service)) |