aboutsummaryrefslogtreecommitdiff
path: root/src/integration-tests/Makefile.am
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-12-02 15:30:56 +0000
committerng0 <ng0@n0.is>2019-12-02 15:30:56 +0000
commitc8e5e28048dd9605f7958ef95f2a6dd626658069 (patch)
tree52375a14cc93c4161a658b4c7a1926dda11d8909 /src/integration-tests/Makefile.am
parent53f35813d89de6f7c91883277129ffda3ca5b772 (diff)
downloadgnunet-c8e5e28048dd9605f7958ef95f2a6dd626658069.tar.gz
gnunet-c8e5e28048dd9605f7958ef95f2a6dd626658069.zip
rewrite sed logic used in Makefiles and move into dosubst awk script.
include 'bin' and its files in dist files, this is where dosubst is located. While the invocation (passing of the variables) is not optimal (yet, will be changed), this will in the end allow sharing code between Makefiles better, and maybe drop sed usage in the future.
Diffstat (limited to 'src/integration-tests/Makefile.am')
-rw-r--r--src/integration-tests/Makefile.am20
1 files changed, 9 insertions, 11 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
36endif 36endif
37endif 37endif
38 38
39do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
40
41SUFFIXES = .py.in .py 39SUFFIXES = .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
46gnunet_testing.py: gnunet_testing.py.in Makefile 44gnunet_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
50gnunet_pyexpect.py: gnunet_pyexpect.py.in Makefile 48gnunet_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
54test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connect.py.in Makefile 52test_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
58test_integration_disconnect.py: test_integration_disconnect.py.in Makefile 56test_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
62test_integration_disconnect_nat.py: test_integration_disconnect_nat.py.in Makefile 60test_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
66test_integration_reconnect.py: test_integration_reconnect.py.in Makefile 64test_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
70test_integration_reconnect_nat.py: test_integration_reconnect_nat.py.in Makefile 68test_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
74test_integration_clique.py: test_integration_clique.py.in Makefile 72test_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