From 16d21a3a2f100e33c2aaeea12a8e4ce41d252507 Mon Sep 17 00:00:00 2001 From: LRN Date: Fri, 16 Aug 2013 04:08:03 +0000 Subject: [PATCH] Fix invocation of just-built tools --- src/arm/test_gnunet_arm.py.in | 4 ++-- src/dht/test_dht_tools.py.in | 4 ++-- src/fs/test_gnunet_fs_idx.py.in | 12 ++++++------ src/fs/test_gnunet_fs_ns.py.in | 20 ++++++++++---------- src/fs/test_gnunet_fs_psd.py.in | 16 ++++++++-------- src/fs/test_gnunet_fs_rec.py.in | 20 ++++++++++---------- src/peerinfo-tool/test_gnunet_peerinfo.py.in | 4 ++-- src/statistics/test_gnunet_statistics.py.in | 4 ++-- 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: if os.name == 'nt': st = 'gnunet-statistics.exe' - arm = 'gnunet-arm.exe' + arm = './gnunet-arm.exe' else: st = 'gnunet-statistics' - arm = 'gnunet-arm' + arm = './gnunet-arm' run_arm = [arm, '-c', 'test_arm_api_data.conf', '--no-stdout', '--no-stderr'] debug = 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: if os.name == 'nt': pif = 'gnunet-peerinfo.exe' - get = 'gnunet-dht-get.exe' - put = 'gnunet-dht-put.exe' + get = './gnunet-dht-get.exe' + put = './gnunet-dht-put.exe' arm = 'gnunet-arm.exe' else: 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: from gnunet_pyexpect import pexpect if os.name == 'posix': - download = 'gnunet-download' + download = './gnunet-download' gnunetarm = 'gnunet-arm' - publish = 'gnunet-publish' - unindex = 'gnunet-unindex' + publish = './gnunet-publish' + unindex = './gnunet-unindex' elif os.name == 'nt': - download = 'gnunet-download.exe' + download = './gnunet-download.exe' gnunetarm = 'gnunet-arm.exe' - publish = 'gnunet-publish.exe' - unindex = 'gnunet-unindex.exe' + publish = './gnunet-publish.exe' + unindex = './gnunet-unindex.exe' if os.name == "nt": 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: from gnunet_pyexpect import pexpect if os.name == 'posix': - pseudonym = 'gnunet-pseudonym' + pseudonym = './gnunet-pseudonym' gnunetarm = 'gnunet-arm' - publish = 'gnunet-publish' - unindex = 'gnunet-unindex' - search = 'gnunet-search' - identity = 'gnunet-identity' + publish = './gnunet-publish' + unindex = './gnunet-unindex' + search = './gnunet-search' + identity = './gnunet-identity' elif os.name == 'nt': - pseudonym = 'gnunet-pseudonym.exe' + pseudonym = './gnunet-pseudonym.exe' gnunetarm = 'gnunet-arm.exe' - publish = 'gnunet-publish.exe' - unindex = 'gnunet-unindex.exe' - search = 'gnunet-search.exe' - identity = 'gnunet-identity.exe' + publish = './gnunet-publish.exe' + unindex = './gnunet-unindex.exe' + search = './gnunet-search.exe' + identity = './gnunet-identity.exe' if os.name == "nt": 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: from gnunet_pyexpect import pexpect if os.name == 'posix': - download = 'gnunet-download' + download = './gnunet-download' gnunetarm = 'gnunet-arm' - publish = 'gnunet-publish' - unindex = 'gnunet-unindex' - search = 'gnunet-search' + publish = './gnunet-publish' + unindex = './gnunet-unindex' + search = './gnunet-search' elif os.name == 'nt': - download = 'gnunet-download.exe' + download = './gnunet-download.exe' gnunetarm = 'gnunet-arm.exe' - publish = 'gnunet-publish.exe' - unindex = 'gnunet-unindex.exe' - search = 'gnunet-search.exe' + publish = './gnunet-publish.exe' + unindex = './gnunet-unindex.exe' + search = './gnunet-search.exe' if os.name == "nt": 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 from pydiffer import dcdiff if os.name == 'posix': - download = 'gnunet-download' + download = './gnunet-download' gnunetarm = 'gnunet-arm' - publish = 'gnunet-publish' - unindex = 'gnunet-unindex' - search = 'gnunet-search' - directory = 'gnunet-directory' + publish = './gnunet-publish' + unindex = './gnunet-unindex' + search = './gnunet-search' + directory = './gnunet-directory' elif os.name == 'nt': - download = 'gnunet-download.exe' + download = './gnunet-download.exe' gnunetarm = 'gnunet-arm.exe' - publish = 'gnunet-publish.exe' - unindex = 'gnunet-unindex.exe' - search = 'gnunet-search.exe' - directory = 'gnunet-directory.exe' + publish = './gnunet-publish.exe' + unindex = './gnunet-unindex.exe' + search = './gnunet-search.exe' + directory = './gnunet-directory.exe' if os.name == "nt": 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: from gnunet_pyexpect import pexpect if os.name == 'posix': - peerinfo = 'gnunet-peerinfo' + peerinfo = './gnunet-peerinfo' gnunetarm = 'gnunet-arm' gnunettesting = 'gnunet-testing' elif os.name == 'nt': - peerinfo = 'gnunet-peerinfo.exe' + peerinfo = './gnunet-peerinfo.exe' gnunetarm = 'gnunet-arm.exe' gnunettesting = 'gnunet-testing.exe' 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: tmp = "/tmp" if os.name == 'nt': - st = 'gnunet-statistics.exe' + st = './gnunet-statistics.exe' arm = 'gnunet-arm.exe' else: - st = 'gnunet-statistics' + st = './gnunet-statistics' arm = 'gnunet-arm' run_st = [st, '-c', 'test_statistics_api_data.conf'] -- 2.25.1