diff options
-rw-r--r-- | src/fs/Makefile.am | 29 | ||||
-rwxr-xr-x | src/fs/test_gnunet_fs_idx.py.in (renamed from src/fs/test_gnunet_fs_idx.py) | 2 | ||||
-rwxr-xr-x | src/fs/test_gnunet_fs_ns.py.in (renamed from src/fs/test_gnunet_fs_ns.py) | 2 | ||||
-rwxr-xr-x | src/fs/test_gnunet_fs_psd.py.in (renamed from src/fs/test_gnunet_fs_psd.py) | 2 | ||||
-rwxr-xr-x | src/fs/test_gnunet_fs_rec.py.in (renamed from src/fs/test_gnunet_fs_rec.py) | 2 | ||||
-rw-r--r-- | src/peerinfo-tool/Makefile.am | 15 | ||||
-rwxr-xr-x | src/peerinfo-tool/test_gnunet_peerinfo.py.in (renamed from src/peerinfo-tool/test_gnunet_peerinfo.py) | 2 |
7 files changed, 42 insertions, 12 deletions
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index d18d06dd7..e497f3e39 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am | |||
@@ -133,10 +133,6 @@ check_PROGRAMS = \ | |||
133 | 133 | ||
134 | 134 | ||
135 | if HAVE_PYTHON_PEXPECT | 135 | if HAVE_PYTHON_PEXPECT |
136 | TEST_EXTENSIONS = .py | ||
137 | PY_LOG_COMPILER = $(PYTHON) | ||
138 | AM_PY_LOG_FLAGS = -v | ||
139 | |||
140 | check_SCRIPTS = \ | 136 | check_SCRIPTS = \ |
141 | test_gnunet_fs_psd.py \ | 137 | test_gnunet_fs_psd.py \ |
142 | test_gnunet_fs_rec.py \ | 138 | test_gnunet_fs_rec.py \ |
@@ -254,6 +250,24 @@ test_gnunet_service_fs_p2p_LDADD = \ | |||
254 | $(top_builddir)/src/fs/libgnunetfs.la \ | 250 | $(top_builddir)/src/fs/libgnunetfs.la \ |
255 | $(top_builddir)/src/util/libgnunetutil.la | 251 | $(top_builddir)/src/util/libgnunetutil.la |
256 | 252 | ||
253 | do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' | ||
254 | |||
255 | test_gnunet_fs_psd.py: test_gnunet_fs_psd.py.in Makefile | ||
256 | $(do_subst) < $(srcdir)/test_gnunet_fs_psd.py.in > test_gnunet_fs_psd.py | ||
257 | chmod +x test_gnunet_fs_psd.py | ||
258 | |||
259 | test_gnunet_fs_rec.py: test_gnunet_fs_rec.py.in Makefile | ||
260 | $(do_subst) < $(srcdir)/test_gnunet_fs_rec.py.in > test_gnunet_fs_rec.py | ||
261 | chmod +x test_gnunet_fs_rec.py | ||
262 | |||
263 | test_gnunet_fs_ns.py: test_gnunet_fs_ns.py.in Makefile | ||
264 | $(do_subst) < $(srcdir)/test_gnunet_fs_ns.py.in > test_gnunet_fs_ns.py | ||
265 | chmod +x test_gnunet_fs_ns.py | ||
266 | |||
267 | test_gnunet_fs_idx.py: test_gnunet_fs_idx.py.in Makefile | ||
268 | $(do_subst) < $(srcdir)/test_gnunet_fs_idx.py.in > test_gnunet_fs_idx.py | ||
269 | chmod +x test_gnunet_fs_idx.py | ||
270 | |||
257 | 271 | ||
258 | EXTRA_DIST = \ | 272 | EXTRA_DIST = \ |
259 | fs_test_lib_data.conf \ | 273 | fs_test_lib_data.conf \ |
@@ -273,4 +287,9 @@ EXTRA_DIST = \ | |||
273 | test_gnunet_fs_psd_data.conf \ | 287 | test_gnunet_fs_psd_data.conf \ |
274 | test_gnunet_fs_rec_data.conf \ | 288 | test_gnunet_fs_rec_data.conf \ |
275 | test_gnunet_fs_rec_data.tgz \ | 289 | test_gnunet_fs_rec_data.tgz \ |
276 | $(check_SCRIPTS) | 290 | test_gnunet_fs_psd.py.in \ |
291 | test_gnunet_fs_rec.py.in \ | ||
292 | test_gnunet_fs_ns.py.in \ | ||
293 | test_gnunet_fs_idx.py.in | ||
294 | |||
295 | CLEANFILES = $(check_SCRIPTS) | ||
diff --git a/src/fs/test_gnunet_fs_idx.py b/src/fs/test_gnunet_fs_idx.py.in index 267d9f2a5..3bb3681c6 100755 --- a/src/fs/test_gnunet_fs_idx.py +++ b/src/fs/test_gnunet_fs_idx.py.in | |||
@@ -1,4 +1,4 @@ | |||
1 | #!/usr/bin/env python | 1 | #!@PYTHON@ |
2 | # This file is part of GNUnet. | 2 | # This file is part of GNUnet. |
3 | # (C) 2010 Christian Grothoff (and other contributing authors) | 3 | # (C) 2010 Christian Grothoff (and other contributing authors) |
4 | # | 4 | # |
diff --git a/src/fs/test_gnunet_fs_ns.py b/src/fs/test_gnunet_fs_ns.py.in index 616b52a29..92fd7d5de 100755 --- a/src/fs/test_gnunet_fs_ns.py +++ b/src/fs/test_gnunet_fs_ns.py.in | |||
@@ -1,4 +1,4 @@ | |||
1 | #!/usr/bin/env python | 1 | #!@PYTHON@ |
2 | # This file is part of GNUnet. | 2 | # This file is part of GNUnet. |
3 | # (C) 2010 Christian Grothoff (and other contributing authors) | 3 | # (C) 2010 Christian Grothoff (and other contributing authors) |
4 | # | 4 | # |
diff --git a/src/fs/test_gnunet_fs_psd.py b/src/fs/test_gnunet_fs_psd.py.in index bb00ba5d1..d66b8b994 100755 --- a/src/fs/test_gnunet_fs_psd.py +++ b/src/fs/test_gnunet_fs_psd.py.in | |||
@@ -1,4 +1,4 @@ | |||
1 | #!/usr/bin/env python | 1 | #!@PYTHON@ |
2 | # This file is part of GNUnet. | 2 | # This file is part of GNUnet. |
3 | # (C) 2010 Christian Grothoff (and other contributing authors) | 3 | # (C) 2010 Christian Grothoff (and other contributing authors) |
4 | # | 4 | # |
diff --git a/src/fs/test_gnunet_fs_rec.py b/src/fs/test_gnunet_fs_rec.py.in index 62189af32..145b8e3b4 100755 --- a/src/fs/test_gnunet_fs_rec.py +++ b/src/fs/test_gnunet_fs_rec.py.in | |||
@@ -1,4 +1,4 @@ | |||
1 | #!/usr/bin/env python | 1 | #!@PYTHON@ |
2 | # This file is part of GNUnet. | 2 | # This file is part of GNUnet. |
3 | # (C) 2010 Christian Grothoff (and other contributing authors) | 3 | # (C) 2010 Christian Grothoff (and other contributing authors) |
4 | # | 4 | # |
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am index 1fc088ad9..8b74efefb 100644 --- a/src/peerinfo-tool/Makefile.am +++ b/src/peerinfo-tool/Makefile.am | |||
@@ -20,8 +20,19 @@ gnunet_peerinfo_LDADD = \ | |||
20 | $(top_builddir)/src/util/libgnunetutil.la | 20 | $(top_builddir)/src/util/libgnunetutil.la |
21 | 21 | ||
22 | if HAVE_PYTHON_PEXPECT | 22 | if HAVE_PYTHON_PEXPECT |
23 | TESTS_ENVIRONMENT = $(PYTHON) | 23 | check_SCRIPTS = \ |
24 | TESTS = \ | ||
25 | test_gnunet_peerinfo.py | 24 | test_gnunet_peerinfo.py |
26 | endif | 25 | endif |
27 | 26 | ||
27 | TESTS = $(check_SCRIPTS) | ||
28 | |||
29 | do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' | ||
30 | |||
31 | test_gnunet_peerinfo.py: test_gnunet_peerinfo.py.in Makefile | ||
32 | $(do_subst) < $(srcdir)/test_gnunet_peerinfo.py.in > test_gnunet_peerinfo.py | ||
33 | chmod +x test_gnunet_peerinfo.py | ||
34 | |||
35 | EXTRADIST = \ | ||
36 | test_gnunet_peerinfo.py.in | ||
37 | |||
38 | CLEANFILES = $(check_SCRIPTS) | ||
diff --git a/src/peerinfo-tool/test_gnunet_peerinfo.py b/src/peerinfo-tool/test_gnunet_peerinfo.py.in index bab59ee47..ba542f28a 100755 --- a/src/peerinfo-tool/test_gnunet_peerinfo.py +++ b/src/peerinfo-tool/test_gnunet_peerinfo.py.in | |||
@@ -1,4 +1,4 @@ | |||
1 | #!/usr/bin/env python | 1 | #!@PYTHON@ |
2 | # This file is part of GNUnet. | 2 | # This file is part of GNUnet. |
3 | # (C) 2010 Christian Grothoff (and other contributing authors) | 3 | # (C) 2010 Christian Grothoff (and other contributing authors) |
4 | # | 4 | # |