diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-12-26 21:22:07 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-12-26 21:22:07 +0000 |
commit | a2c1489ccaa95fc2c0e54b5838c3c5c1fc2126b2 (patch) | |
tree | 3104616d0a573afa841213875d6dc7de13bf1317 /src/integration-tests | |
parent | 5f710a3376f22463313cff3828af49e92cb5c317 (diff) | |
download | gnunet-a2c1489ccaa95fc2c0e54b5838c3c5c1fc2126b2.tar.gz gnunet-a2c1489ccaa95fc2c0e54b5838c3c5c1fc2126b2.zip |
-cleaning up for disting
Diffstat (limited to 'src/integration-tests')
-rw-r--r-- | src/integration-tests/Makefile.am | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am index 5d323e206..f8dbd0e07 100644 --- a/src/integration-tests/Makefile.am +++ b/src/integration-tests/Makefile.am | |||
@@ -19,11 +19,11 @@ noinst_SCRIPTS = \ | |||
19 | if HAVE_PYTHON_PEXPECT | 19 | if HAVE_PYTHON_PEXPECT |
20 | check_SCRIPTS = \ | 20 | check_SCRIPTS = \ |
21 | test_integration_bootstrap_and_connect.py \ | 21 | test_integration_bootstrap_and_connect.py \ |
22 | test_integration_disconnect.py \ | ||
23 | test_integration_restart.py \ | 22 | test_integration_restart.py \ |
24 | test_integration_clique.py \ | 23 | test_integration_clique.py \ |
25 | test_integration_clique_nat.py | 24 | test_integration_clique_nat.py |
26 | endif | 25 | endif |
26 | # test_integration_disconnect.py | ||
27 | 27 | ||
28 | 28 | ||
29 | if ENABLE_TEST_RUN | 29 | if ENABLE_TEST_RUN |
@@ -36,7 +36,7 @@ do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' | |||
36 | %.py: %.py.in Makefile | 36 | %.py: %.py.in Makefile |
37 | $(do_subst) < $(srcdir)/$< > $@ | 37 | $(do_subst) < $(srcdir)/$< > $@ |
38 | chmod +x $@ | 38 | chmod +x $@ |
39 | 39 | ||
40 | gnunet_testing.py: gnunet_testing.py.in Makefile | 40 | gnunet_testing.py: gnunet_testing.py.in Makefile |
41 | $(do_subst) < $(srcdir)/gnunet_testing.py.in > gnunet_testing.py | 41 | $(do_subst) < $(srcdir)/gnunet_testing.py.in > gnunet_testing.py |
42 | chmod +x gnunet_testing.py | 42 | chmod +x gnunet_testing.py |
@@ -49,14 +49,14 @@ test_integration_disconnect.py: test_integration_disconnect.py.in Makefile | |||
49 | $(do_subst) < $(srcdir)/test_integration_disconnect.py.in > test_integration_disconnect.py | 49 | $(do_subst) < $(srcdir)/test_integration_disconnect.py.in > test_integration_disconnect.py |
50 | chmod +x test_integration_disconnect.py | 50 | chmod +x test_integration_disconnect.py |
51 | 51 | ||
52 | test_integration_disconnect_nat.py: test_integration_disconnect_nat.py.in Makefile | 52 | #test_integration_disconnect_nat.py: test_integration_disconnect_nat.py.in Makefile |
53 | $(do_subst) < $(srcdir)/test_integration_disconnect_nat.py.in > test_integration_disconnect_nat.py | 53 | # $(do_subst) < $(srcdir)/test_integration_disconnect_nat.py.in > test_integration_disconnect_nat.py |
54 | chmod +x test_integration_disconnect_nat.py | 54 | # chmod +x test_integration_disconnect_nat.py |
55 | 55 | ||
56 | test_integration_restart.py: test_integration_restart.py.in Makefile | 56 | test_integration_restart.py: test_integration_restart.py.in Makefile |
57 | $(do_subst) < $(srcdir)/test_integration_restart.py.in > test_integration_restart.py | 57 | $(do_subst) < $(srcdir)/test_integration_restart.py.in > test_integration_restart.py |
58 | chmod +x test_integration_restart.py | 58 | chmod +x test_integration_restart.py |
59 | 59 | ||
60 | test_integration_clique.py: test_integration_clique.py.in Makefile | 60 | test_integration_clique.py: test_integration_clique.py.in Makefile |
61 | $(do_subst) < $(srcdir)/test_integration_clique.py.in > test_integration_clique.py | 61 | $(do_subst) < $(srcdir)/test_integration_clique.py.in > test_integration_clique.py |
62 | chmod +x test_integration_clique.py | 62 | chmod +x test_integration_clique.py |
@@ -70,11 +70,12 @@ EXTRA_DIST = \ | |||
70 | gnunet_testing.py.in \ | 70 | gnunet_testing.py.in \ |
71 | test_integration_bootstrap_and_connect.py.in \ | 71 | test_integration_bootstrap_and_connect.py.in \ |
72 | test_integration_disconnect.py.in \ | 72 | test_integration_disconnect.py.in \ |
73 | test_integration_disconnect_nat.py \ | ||
74 | test_integration_restart.py.in \ | 73 | test_integration_restart.py.in \ |
75 | test_integration_clique.py.in \ | 74 | test_integration_clique.py.in \ |
76 | test_integration_clique_nat.py.in | 75 | test_integration_clique_nat.py.in |
77 | 76 | ||
77 | # test_integration_disconnect_nat.py | ||
78 | |||
78 | CLEANFILES = \ | 79 | CLEANFILES = \ |
79 | $(check_SCRIPTS) \ | 80 | $(check_SCRIPTS) \ |
80 | gnunet_testing.py | 81 | gnunet_testing.py |