aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLRN <lrn1986@gmail.com>2013-08-16 04:08:03 +0000
committerLRN <lrn1986@gmail.com>2013-08-16 04:08:03 +0000
commit16d21a3a2f100e33c2aaeea12a8e4ce41d252507 (patch)
treeaa8e53d1d398d27ee72ac6489e0d080ff5b48057
parenta67f39e2f07320d19f3f03d6ca22ae5ee53ea230 (diff)
downloadgnunet-16d21a3a2f100e33c2aaeea12a8e4ce41d252507.tar.gz
gnunet-16d21a3a2f100e33c2aaeea12a8e4ce41d252507.zip
Fix invocation of just-built tools
-rw-r--r--src/arm/test_gnunet_arm.py.in4
-rw-r--r--src/dht/test_dht_tools.py.in4
-rwxr-xr-xsrc/fs/test_gnunet_fs_idx.py.in12
-rwxr-xr-xsrc/fs/test_gnunet_fs_ns.py.in20
-rwxr-xr-xsrc/fs/test_gnunet_fs_psd.py.in16
-rwxr-xr-xsrc/fs/test_gnunet_fs_rec.py.in20
-rwxr-xr-xsrc/peerinfo-tool/test_gnunet_peerinfo.py.in4
-rw-r--r--src/statistics/test_gnunet_statistics.py.in4
8 files changed, 42 insertions, 42 deletions
diff --git a/src/arm/test_gnunet_arm.py.in b/src/arm/test_gnunet_arm.py.in
index c7698a3ce..cdd69251b 100644
--- a/src/arm/test_gnunet_arm.py.in
+++ b/src/arm/test_gnunet_arm.py.in
@@ -14,10 +14,10 @@ else:
14 14
15if os.name == 'nt': 15if os.name == 'nt':
16 st = 'gnunet-statistics.exe' 16 st = 'gnunet-statistics.exe'
17 arm = 'gnunet-arm.exe' 17 arm = './gnunet-arm.exe'
18else: 18else:
19 st = 'gnunet-statistics' 19 st = 'gnunet-statistics'
20 arm = 'gnunet-arm' 20 arm = './gnunet-arm'
21 21
22run_arm = [arm, '-c', 'test_arm_api_data.conf', '--no-stdout', '--no-stderr'] 22run_arm = [arm, '-c', 'test_arm_api_data.conf', '--no-stdout', '--no-stderr']
23debug = os.getenv ('DEBUG') 23debug = os.getenv ('DEBUG')
diff --git a/src/dht/test_dht_tools.py.in b/src/dht/test_dht_tools.py.in
index 186c39b96..1c6bdea18 100644
--- a/src/dht/test_dht_tools.py.in
+++ b/src/dht/test_dht_tools.py.in
@@ -15,8 +15,8 @@ else:
15 15
16if os.name == 'nt': 16if os.name == 'nt':
17 pif = 'gnunet-peerinfo.exe' 17 pif = 'gnunet-peerinfo.exe'
18 get = 'gnunet-dht-get.exe' 18 get = './gnunet-dht-get.exe'
19 put = 'gnunet-dht-put.exe' 19 put = './gnunet-dht-put.exe'
20 arm = 'gnunet-arm.exe' 20 arm = 'gnunet-arm.exe'
21else: 21else:
22 pif = 'gnunet-peerinfo' 22 pif = 'gnunet-peerinfo'
diff --git a/src/fs/test_gnunet_fs_idx.py.in b/src/fs/test_gnunet_fs_idx.py.in
index c7858d9be..0f8343057 100755
--- a/src/fs/test_gnunet_fs_idx.py.in
+++ b/src/fs/test_gnunet_fs_idx.py.in
@@ -32,15 +32,15 @@ if gnunet_pyexpect_dir not in sys.path:
32from gnunet_pyexpect import pexpect 32from gnunet_pyexpect import pexpect
33 33
34if os.name == 'posix': 34if os.name == 'posix':
35 download = 'gnunet-download' 35 download = './gnunet-download'
36 gnunetarm = 'gnunet-arm' 36 gnunetarm = 'gnunet-arm'
37 publish = 'gnunet-publish' 37 publish = './gnunet-publish'
38 unindex = 'gnunet-unindex' 38 unindex = './gnunet-unindex'
39elif os.name == 'nt': 39elif os.name == 'nt':
40 download = 'gnunet-download.exe' 40 download = './gnunet-download.exe'
41 gnunetarm = 'gnunet-arm.exe' 41 gnunetarm = 'gnunet-arm.exe'
42 publish = 'gnunet-publish.exe' 42 publish = './gnunet-publish.exe'
43 unindex = 'gnunet-unindex.exe' 43 unindex = './gnunet-unindex.exe'
44 44
45if os.name == "nt": 45if os.name == "nt":
46 shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-idx"), True) 46 shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-idx"), True)
diff --git a/src/fs/test_gnunet_fs_ns.py.in b/src/fs/test_gnunet_fs_ns.py.in
index 905915abc..46080df4f 100755
--- a/src/fs/test_gnunet_fs_ns.py.in
+++ b/src/fs/test_gnunet_fs_ns.py.in
@@ -32,19 +32,19 @@ if gnunet_pyexpect_dir not in sys.path:
32from gnunet_pyexpect import pexpect 32from gnunet_pyexpect import pexpect
33 33
34if os.name == 'posix': 34if os.name == 'posix':
35 pseudonym = 'gnunet-pseudonym' 35 pseudonym = './gnunet-pseudonym'
36 gnunetarm = 'gnunet-arm' 36 gnunetarm = 'gnunet-arm'
37 publish = 'gnunet-publish' 37 publish = './gnunet-publish'
38 unindex = 'gnunet-unindex' 38 unindex = './gnunet-unindex'
39 search = 'gnunet-search' 39 search = './gnunet-search'
40 identity = 'gnunet-identity' 40 identity = './gnunet-identity'
41elif os.name == 'nt': 41elif os.name == 'nt':
42 pseudonym = 'gnunet-pseudonym.exe' 42 pseudonym = './gnunet-pseudonym.exe'
43 gnunetarm = 'gnunet-arm.exe' 43 gnunetarm = 'gnunet-arm.exe'
44 publish = 'gnunet-publish.exe' 44 publish = './gnunet-publish.exe'
45 unindex = 'gnunet-unindex.exe' 45 unindex = './gnunet-unindex.exe'
46 search = 'gnunet-search.exe' 46 search = './gnunet-search.exe'
47 identity = 'gnunet-identity.exe' 47 identity = './gnunet-identity.exe'
48 48
49if os.name == "nt": 49if os.name == "nt":
50 shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-ns"), True) 50 shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-ns"), True)
diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in
index 85ad30e61..ab23da42a 100755
--- a/src/fs/test_gnunet_fs_psd.py.in
+++ b/src/fs/test_gnunet_fs_psd.py.in
@@ -32,17 +32,17 @@ if gnunet_pyexpect_dir not in sys.path:
32from gnunet_pyexpect import pexpect 32from gnunet_pyexpect import pexpect
33 33
34if os.name == 'posix': 34if os.name == 'posix':
35 download = 'gnunet-download' 35 download = './gnunet-download'
36 gnunetarm = 'gnunet-arm' 36 gnunetarm = 'gnunet-arm'
37 publish = 'gnunet-publish' 37 publish = './gnunet-publish'
38 unindex = 'gnunet-unindex' 38 unindex = './gnunet-unindex'
39 search = 'gnunet-search' 39 search = './gnunet-search'
40elif os.name == 'nt': 40elif os.name == 'nt':
41 download = 'gnunet-download.exe' 41 download = './gnunet-download.exe'
42 gnunetarm = 'gnunet-arm.exe' 42 gnunetarm = 'gnunet-arm.exe'
43 publish = 'gnunet-publish.exe' 43 publish = './gnunet-publish.exe'
44 unindex = 'gnunet-unindex.exe' 44 unindex = './gnunet-unindex.exe'
45 search = 'gnunet-search.exe' 45 search = './gnunet-search.exe'
46 46
47if os.name == "nt": 47if os.name == "nt":
48 shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-psd"), True) 48 shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-psd"), True)
diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in
index 4f955b47c..dcfe6ae30 100755
--- a/src/fs/test_gnunet_fs_rec.py.in
+++ b/src/fs/test_gnunet_fs_rec.py.in
@@ -35,19 +35,19 @@ from gnunet_pyexpect import pexpect
35from pydiffer import dcdiff 35from pydiffer import dcdiff
36 36
37if os.name == 'posix': 37if os.name == 'posix':
38 download = 'gnunet-download' 38 download = './gnunet-download'
39 gnunetarm = 'gnunet-arm' 39 gnunetarm = 'gnunet-arm'
40 publish = 'gnunet-publish' 40 publish = './gnunet-publish'
41 unindex = 'gnunet-unindex' 41 unindex = './gnunet-unindex'
42 search = 'gnunet-search' 42 search = './gnunet-search'
43 directory = 'gnunet-directory' 43 directory = './gnunet-directory'
44elif os.name == 'nt': 44elif os.name == 'nt':
45 download = 'gnunet-download.exe' 45 download = './gnunet-download.exe'
46 gnunetarm = 'gnunet-arm.exe' 46 gnunetarm = 'gnunet-arm.exe'
47 publish = 'gnunet-publish.exe' 47 publish = './gnunet-publish.exe'
48 unindex = 'gnunet-unindex.exe' 48 unindex = './gnunet-unindex.exe'
49 search = 'gnunet-search.exe' 49 search = './gnunet-search.exe'
50 directory = 'gnunet-directory.exe' 50 directory = './gnunet-directory.exe'
51 51
52if os.name == "nt": 52if os.name == "nt":
53 shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-rec"), True) 53 shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-rec"), True)
diff --git a/src/peerinfo-tool/test_gnunet_peerinfo.py.in b/src/peerinfo-tool/test_gnunet_peerinfo.py.in
index 81acb3c8b..695a449af 100755
--- a/src/peerinfo-tool/test_gnunet_peerinfo.py.in
+++ b/src/peerinfo-tool/test_gnunet_peerinfo.py.in
@@ -33,11 +33,11 @@ if gnunet_pyexpect_dir not in sys.path:
33from gnunet_pyexpect import pexpect 33from gnunet_pyexpect import pexpect
34 34
35if os.name == 'posix': 35if os.name == 'posix':
36 peerinfo = 'gnunet-peerinfo' 36 peerinfo = './gnunet-peerinfo'
37 gnunetarm = 'gnunet-arm' 37 gnunetarm = 'gnunet-arm'
38 gnunettesting = 'gnunet-testing' 38 gnunettesting = 'gnunet-testing'
39elif os.name == 'nt': 39elif os.name == 'nt':
40 peerinfo = 'gnunet-peerinfo.exe' 40 peerinfo = './gnunet-peerinfo.exe'
41 gnunetarm = 'gnunet-arm.exe' 41 gnunetarm = 'gnunet-arm.exe'
42 gnunettesting = 'gnunet-testing.exe' 42 gnunettesting = 'gnunet-testing.exe'
43 43
diff --git a/src/statistics/test_gnunet_statistics.py.in b/src/statistics/test_gnunet_statistics.py.in
index 0d3c984eb..b2da410a2 100644
--- a/src/statistics/test_gnunet_statistics.py.in
+++ b/src/statistics/test_gnunet_statistics.py.in
@@ -13,10 +13,10 @@ else:
13 tmp = "/tmp" 13 tmp = "/tmp"
14 14
15if os.name == 'nt': 15if os.name == 'nt':
16 st = 'gnunet-statistics.exe' 16 st = './gnunet-statistics.exe'
17 arm = 'gnunet-arm.exe' 17 arm = 'gnunet-arm.exe'
18else: 18else:
19 st = 'gnunet-statistics' 19 st = './gnunet-statistics'
20 arm = 'gnunet-arm' 20 arm = 'gnunet-arm'
21 21
22run_st = [st, '-c', 'test_statistics_api_data.conf'] 22run_st = [st, '-c', 'test_statistics_api_data.conf']