diff options
Diffstat (limited to 'src/dht')
-rw-r--r-- | src/dht/Makefile.am | 4 | ||||
-rw-r--r-- | src/dht/test_dht_tools.py.in | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index f712890ac..00ce0e934 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am | |||
@@ -50,13 +50,13 @@ libgnunet_plugin_block_dht_la_LDFLAGS = \ | |||
50 | libexec_PROGRAMS = \ | 50 | libexec_PROGRAMS = \ |
51 | gnunet-service-dht | 51 | gnunet-service-dht |
52 | 52 | ||
53 | noinst_PROGRAMS = \ | 53 | bin_PROGRAMS = \ |
54 | gnunet-dht-monitor \ | 54 | gnunet-dht-monitor \ |
55 | gnunet-dht-get \ | 55 | gnunet-dht-get \ |
56 | gnunet-dht-put | 56 | gnunet-dht-put |
57 | 57 | ||
58 | if HAVE_TESTING | 58 | if HAVE_TESTING |
59 | noinst_PROGRAMS += \ | 59 | noinst_PROGRAMS = \ |
60 | gnunet-dht-profiler | 60 | gnunet-dht-profiler |
61 | endif | 61 | endif |
62 | 62 | ||
diff --git a/src/dht/test_dht_tools.py.in b/src/dht/test_dht_tools.py.in index 5ceabbfad..f5dd14f67 100644 --- a/src/dht/test_dht_tools.py.in +++ b/src/dht/test_dht_tools.py.in | |||
@@ -36,18 +36,16 @@ else: | |||
36 | put = './gnunet-dht-put' | 36 | put = './gnunet-dht-put' |
37 | arm = 'gnunet-arm' | 37 | arm = 'gnunet-arm' |
38 | 38 | ||
39 | tf, tempcfg = tempfile.mkstemp (prefix='test_dht_api_peer1.') | 39 | cfgfile = 'test_dht_api_peer1.conf' |
40 | os.close (tf) | 40 | |
41 | 41 | run_get = [get, '-c', cfgfile] | |
42 | run_get = [get, '-c', tempcfg] | 42 | run_put = [put, '-c', cfgfile] |
43 | run_put = [put, '-c', tempcfg] | 43 | run_arm = [arm, '-c', cfgfile] |
44 | run_arm = [arm, '-c', tempcfg] | ||
45 | debug = os.getenv ('DEBUG') | 44 | debug = os.getenv ('DEBUG') |
46 | if debug: | 45 | if debug: |
47 | run_arm += [debug.split (' ')] | 46 | run_arm += [debug.split (' ')] |
48 | 47 | ||
49 | def cleanup (exitcode): | 48 | def cleanup (exitcode): |
50 | os.remove (tempcfg) | ||
51 | sys.exit (exitcode) | 49 | sys.exit (exitcode) |
52 | 50 | ||
53 | def sub_run (args, want_stdo = True, want_stde = False, nofail = False): | 51 | def sub_run (args, want_stdo = True, want_stde = False, nofail = False): |
@@ -104,7 +102,6 @@ def print_only_failer (command, rc, stdo, stde, normal): | |||
104 | print ("FAIL: expected error while running {}\nCommand output was:\n{}\n{}".format (command, stdo, stde)) | 102 | print ("FAIL: expected error while running {}\nCommand output was:\n{}\n{}".format (command, stdo, stde)) |
105 | cleanup (1) | 103 | cleanup (1) |
106 | 104 | ||
107 | shutil.copyfile ('test_dht_api_peer1.conf', tempcfg) | ||
108 | 105 | ||
109 | print ("TEST: Starting ARM...", end='') | 106 | print ("TEST: Starting ARM...", end='') |
110 | r_arm (['-s'], failer = end_arm_failer, want_stdo = False, want_stde = False) | 107 | r_arm (['-s'], failer = end_arm_failer, want_stdo = False, want_stde = False) |