(no commit message)

[oweals/gnunet.git] / src / integration-tests / Makefile.am

diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 43c35aeb8e7bcadcf27d3b50873f56ee3e617365..1e5686bf8009e8628ef532630ec37f896300287b 100644 (file)
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -13,11 +13,15 @@ bin_PROGRAMS =
 
 check_PROGRAMS =
 
+noinst_SCRIPTS = \
+ gnunet_testing.py
 
 if HAVE_PYTHON_PEXPECT
 check_SCRIPTS = \
  test_integration_bootstrap_and_connect.py \
- test_integration_clique.py 
+ test_integration_disconnect.py \
+ test_integration_restart.py \
+ test_integration_clique.py
 endif
 
 
@@ -28,17 +32,33 @@ endif
 
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 
-test_integration_clique.py: test_integration_clique.py.in Makefile
-       $(do_subst) < $(srcdir)/test_integration_clique.py.in > test_integration_clique.py
-       chmod +x test_integration_clique.py
+%.py: %.py.in Makefile
+       $(do_subst) < $(srcdir)/$< > $@
+       chmod +x $@
 
 test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connect.py.in Makefile
        $(do_subst) < $(srcdir)/test_integration_bootstrap_and_connect.py.in > test_integration_bootstrap_and_connect.py
        chmod +x test_integration_bootstrap_and_connect.py
 
-EXTRA_DIST = \
-   test_integration_bootstrap_and_connect.py.in
-#  test_integration_clique.py.in
+test_integration_disconnect.py: test_integration_disconnect.py.in Makefile
+       $(do_subst) < $(srcdir)/test_integration_disconnect.py.in > test_integration_disconnect.py
+       chmod +x test_integration_disconnect.py
 
+test_integration_restart.py: test_integration_restart.py.in Makefile
+       $(do_subst) < $(srcdir)/test_integration_restart.py.in > test_integration_restart.py
+       chmod +x test_integration_restart.py    
+       
+test_integration_clique.py: test_integration_clique.py.in Makefile
+       $(do_subst) < $(srcdir)/test_integration_clique.py.in > test_integration_clique.py
+       chmod +x test_integration_clique.py     
+
+EXTRA_DIST = \
+   gnunet_testing.py.in \
+   test_integration_bootstrap_and_connect.py.in \
+   test_integration_disconnect.py.in \
+   test_integration_restart.py.in \ 
+   test_integration_clique.py.in
 
-CLEANFILES = $(check_SCRIPTS)
+CLEANFILES = \
+       $(check_SCRIPTS) \
+       gnunet_testing.py