diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-02-17 09:20:46 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-02-17 09:20:46 +0000 |
commit | 8865c486ab23e325c66fd710f5441e3e53e8ab30 (patch) | |
tree | aa338b3cb487c9eaa4f63d4955fc947ea22bdb68 /src/integration-tests | |
parent | 6b66d2f47c58508b0e9ebee9a646534809a36a7d (diff) | |
download | gnunet-8865c486ab23e325c66fd710f5441e3e53e8ab30.tar.gz gnunet-8865c486ab23e325c66fd710f5441e3e53e8ab30.zip |
- pexpect
Diffstat (limited to 'src/integration-tests')
-rw-r--r-- | src/integration-tests/Makefile.am | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am index 731098bc6..feebde269 100644 --- a/src/integration-tests/Makefile.am +++ b/src/integration-tests/Makefile.am | |||
@@ -14,7 +14,8 @@ bin_PROGRAMS = | |||
14 | check_PROGRAMS = | 14 | check_PROGRAMS = |
15 | 15 | ||
16 | noinst_SCRIPTS = \ | 16 | noinst_SCRIPTS = \ |
17 | gnunet_testing.py | 17 | gnunet_testing.py \ |
18 | gnunet_pyexpect.py | ||
18 | 19 | ||
19 | if HAVE_PYTHON_PEXPECT | 20 | if HAVE_PYTHON_PEXPECT |
20 | check_SCRIPTS = \ | 21 | check_SCRIPTS = \ |
@@ -41,6 +42,10 @@ gnunet_testing.py: gnunet_testing.py.in Makefile | |||
41 | $(do_subst) < $(srcdir)/gnunet_testing.py.in > gnunet_testing.py | 42 | $(do_subst) < $(srcdir)/gnunet_testing.py.in > gnunet_testing.py |
42 | chmod +x gnunet_testing.py | 43 | chmod +x gnunet_testing.py |
43 | 44 | ||
45 | gnunet_pyexpect.py: gnunet_pyexpect.py.in Makefile | ||
46 | $(do_subst) < $(srcdir)/gnunet_pyexpect.py.in > gnunet_pyexpect.py | ||
47 | chmod +x gnunet_pyexpect.py | ||
48 | |||
44 | test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connect.py.in Makefile | 49 | test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connect.py.in Makefile |
45 | $(do_subst) < $(srcdir)/test_integration_bootstrap_and_connect.py.in > test_integration_bootstrap_and_connect.py | 50 | $(do_subst) < $(srcdir)/test_integration_bootstrap_and_connect.py.in > test_integration_bootstrap_and_connect.py |
46 | chmod +x test_integration_bootstrap_and_connect.py | 51 | chmod +x test_integration_bootstrap_and_connect.py |
@@ -68,6 +73,7 @@ test_integration_clique_nat.py: test_integration_clique_nat.py.in Makefile | |||
68 | 73 | ||
69 | EXTRA_DIST = \ | 74 | EXTRA_DIST = \ |
70 | gnunet_testing.py.in \ | 75 | gnunet_testing.py.in \ |
76 | gnunet_pyexpect.py.in \ | ||
71 | test_integration_bootstrap_and_connect.py.in \ | 77 | test_integration_bootstrap_and_connect.py.in \ |
72 | test_integration_disconnect.py.in \ | 78 | test_integration_disconnect.py.in \ |
73 | test_integration_restart.py.in \ | 79 | test_integration_restart.py.in \ |
@@ -87,9 +93,6 @@ EXTRA_DIST = \ | |||
87 | hostkeys/0007-hostkey \ | 93 | hostkeys/0007-hostkey \ |
88 | hostkeys/0008-hostkey \ | 94 | hostkeys/0008-hostkey \ |
89 | hostkeys/0009-hostkey | 95 | hostkeys/0009-hostkey |
90 | |||
91 | |||
92 | |||
93 | # test_integration_disconnect_nat.py | 96 | # test_integration_disconnect_nat.py |
94 | 97 | ||
95 | CLEANFILES = \ | 98 | CLEANFILES = \ |