diff options
Diffstat (limited to 'src/integration-tests')
9 files changed, 17 insertions, 19 deletions
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am index 8b50def4d..f456544db 100644 --- a/src/integration-tests/Makefile.am +++ b/src/integration-tests/Makefile.am | |||
| @@ -36,43 +36,41 @@ endif | |||
| 36 | endif | 36 | endif |
| 37 | endif | 37 | endif |
| 38 | 38 | ||
| 39 | do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' | ||
| 40 | |||
| 41 | SUFFIXES = .py.in .py | 39 | SUFFIXES = .py.in .py |
| 42 | .py.in.py: | 40 | .py.in.py: |
| 43 | $(do_subst) < $(srcdir)/$< > $@ | 41 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/$< > $@ |
| 44 | chmod +x $@ | 42 | chmod +x $@ |
| 45 | 43 | ||
| 46 | gnunet_testing.py: gnunet_testing.py.in Makefile | 44 | gnunet_testing.py: gnunet_testing.py.in Makefile |
| 47 | $(do_subst) < $(srcdir)/gnunet_testing.py.in > gnunet_testing.py | 45 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/gnunet_testing.py.in > gnunet_testing.py |
| 48 | chmod +x gnunet_testing.py | 46 | chmod +x gnunet_testing.py |
| 49 | 47 | ||
| 50 | gnunet_pyexpect.py: gnunet_pyexpect.py.in Makefile | 48 | gnunet_pyexpect.py: gnunet_pyexpect.py.in Makefile |
| 51 | $(do_subst) < $(srcdir)/gnunet_pyexpect.py.in > gnunet_pyexpect.py | 49 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/gnunet_pyexpect.py.in > gnunet_pyexpect.py |
| 52 | chmod +x gnunet_pyexpect.py | 50 | chmod +x gnunet_pyexpect.py |
| 53 | 51 | ||
| 54 | test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connect.py.in Makefile | 52 | test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connect.py.in Makefile |
| 55 | $(do_subst) < $(srcdir)/test_integration_bootstrap_and_connect.py.in > test_integration_bootstrap_and_connect.py | 53 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_integration_bootstrap_and_connect.py.in > test_integration_bootstrap_and_connect.py |
| 56 | chmod +x test_integration_bootstrap_and_connect.py | 54 | chmod +x test_integration_bootstrap_and_connect.py |
| 57 | 55 | ||
| 58 | test_integration_disconnect.py: test_integration_disconnect.py.in Makefile | 56 | test_integration_disconnect.py: test_integration_disconnect.py.in Makefile |
| 59 | $(do_subst) < $(srcdir)/test_integration_disconnect.py.in > test_integration_disconnect.py | 57 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_integration_disconnect.py.in > test_integration_disconnect.py |
| 60 | chmod +x test_integration_disconnect.py | 58 | chmod +x test_integration_disconnect.py |
| 61 | 59 | ||
| 62 | test_integration_disconnect_nat.py: test_integration_disconnect_nat.py.in Makefile | 60 | test_integration_disconnect_nat.py: test_integration_disconnect_nat.py.in Makefile |
| 63 | $(do_subst) < $(srcdir)/test_integration_disconnect_nat.py.in > test_integration_disconnect_nat.py | 61 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_integration_disconnect_nat.py.in > test_integration_disconnect_nat.py |
| 64 | chmod +x test_integration_disconnect_nat.py | 62 | chmod +x test_integration_disconnect_nat.py |
| 65 | 63 | ||
| 66 | test_integration_reconnect.py: test_integration_reconnect.py.in Makefile | 64 | test_integration_reconnect.py: test_integration_reconnect.py.in Makefile |
| 67 | $(do_subst) < $(srcdir)/test_integration_reconnect.py.in > test_integration_reconnect.py | 65 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_integration_reconnect.py.in > test_integration_reconnect.py |
| 68 | chmod +x test_integration_reconnect.py | 66 | chmod +x test_integration_reconnect.py |
| 69 | 67 | ||
| 70 | test_integration_reconnect_nat.py: test_integration_reconnect_nat.py.in Makefile | 68 | test_integration_reconnect_nat.py: test_integration_reconnect_nat.py.in Makefile |
| 71 | $(do_subst) < $(srcdir)/test_integration_reconnect_nat.py.in > test_integration_reconnect_nat.py | 69 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_integration_reconnect_nat.py.in > test_integration_reconnect_nat.py |
| 72 | chmod +x test_integration_reconnect_nat.py | 70 | chmod +x test_integration_reconnect_nat.py |
| 73 | 71 | ||
| 74 | test_integration_clique.py: test_integration_clique.py.in Makefile | 72 | test_integration_clique.py: test_integration_clique.py.in Makefile |
| 75 | $(do_subst) < $(srcdir)/test_integration_clique.py.in > test_integration_clique.py | 73 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_integration_clique.py.in > test_integration_clique.py |
| 76 | chmod +x test_integration_clique.py | 74 | chmod +x test_integration_clique.py |
| 77 | 75 | ||
| 78 | 76 | ||
diff --git a/src/integration-tests/gnunet_pyexpect.py.in b/src/integration-tests/gnunet_pyexpect.py.in index aad84e4f7..b8ce52f00 100644 --- a/src/integration-tests/gnunet_pyexpect.py.in +++ b/src/integration-tests/gnunet_pyexpect.py.in | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #!@PYTHON@ | 1 | #!@PYTHONEXE@ |
| 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/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in index 10f9d4475..828f6ff42 100644 --- a/src/integration-tests/gnunet_testing.py.in +++ b/src/integration-tests/gnunet_testing.py.in | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #!@PYTHON@ | 1 | #!@PYTHONEXE@ |
| 2 | # This file is part of GNUnet. | 2 | # This file is part of GNUnet. |
| 3 | # (C) 2010, 2017, 2018 Christian Grothoff (and other contributing authors) | 3 | # (C) 2010, 2017, 2018 Christian Grothoff (and other contributing authors) |
| 4 | # | 4 | # |
diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect.py.in index ddac326cd..441523dfe 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #!@PYTHON@ | 1 | #!@PYTHONEXE@ |
| 2 | # This file is part of GNUnet. | 2 | # This file is part of GNUnet. |
| 3 | # (C) 2010, 2018 Christian Grothoff (and other contributing authors) | 3 | # (C) 2010, 2018 Christian Grothoff (and other contributing authors) |
| 4 | # | 4 | # |
diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in index a23c025ca..65df632f0 100755 --- a/src/integration-tests/test_integration_clique.py.in +++ b/src/integration-tests/test_integration_clique.py.in | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #!@PYTHON@ | 1 | #!@PYTHONEXE@ |
| 2 | # This file is part of GNUnet. | 2 | # This file is part of GNUnet. |
| 3 | # (C) 2010, 2018 Christian Grothoff (and other contributing authors) | 3 | # (C) 2010, 2018 Christian Grothoff (and other contributing authors) |
| 4 | # | 4 | # |
diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in index 9861728c2..c942042c4 100755 --- a/src/integration-tests/test_integration_disconnect.py.in +++ b/src/integration-tests/test_integration_disconnect.py.in | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #!@PYTHON@ | 1 | #!@PYTHONEXE@ |
| 2 | # This file is part of GNUnet. | 2 | # This file is part of GNUnet. |
| 3 | # (C) 2010, 2017 Christian Grothoff (and other contributing authors) | 3 | # (C) 2010, 2017 Christian Grothoff (and other contributing authors) |
| 4 | # | 4 | # |
diff --git a/src/integration-tests/test_integration_disconnect_nat.py.in b/src/integration-tests/test_integration_disconnect_nat.py.in index d3ff84ebe..2f10818cc 100755 --- a/src/integration-tests/test_integration_disconnect_nat.py.in +++ b/src/integration-tests/test_integration_disconnect_nat.py.in | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #!@PYTHON@ | 1 | #!@PYTHONEXE@ |
| 2 | # This file is part of GNUnet. | 2 | # This file is part of GNUnet. |
| 3 | # (C) 2010, 2018 Christian Grothoff (and other contributing authors) | 3 | # (C) 2010, 2018 Christian Grothoff (and other contributing authors) |
| 4 | # | 4 | # |
diff --git a/src/integration-tests/test_integration_reconnect.py.in b/src/integration-tests/test_integration_reconnect.py.in index 5bffb72e3..97dc94502 100755 --- a/src/integration-tests/test_integration_reconnect.py.in +++ b/src/integration-tests/test_integration_reconnect.py.in | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #!@PYTHON@ | 1 | #!@PYTHONEXE@ |
| 2 | # This file is part of GNUnet. | 2 | # This file is part of GNUnet. |
| 3 | # (C) 2010, 2017 Christian Grothoff (and other contributing authors) | 3 | # (C) 2010, 2017 Christian Grothoff (and other contributing authors) |
| 4 | # | 4 | # |
diff --git a/src/integration-tests/test_integration_reconnect_nat.py.in b/src/integration-tests/test_integration_reconnect_nat.py.in index 751a0484b..7624e7b38 100755 --- a/src/integration-tests/test_integration_reconnect_nat.py.in +++ b/src/integration-tests/test_integration_reconnect_nat.py.in | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #!@PYTHON@ | 1 | #!@PYTHONEXE@ |
| 2 | # This file is part of GNUnet. | 2 | # This file is part of GNUnet. |
| 3 | # (C) 2010, 2018 Christian Grothoff (and other contributing authors) | 3 | # (C) 2010, 2018 Christian Grothoff (and other contributing authors) |
| 4 | # | 4 | # |