[GNUnet-SVN] [gnurl] branch master updated: Use awk to substitute the right path of python.

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

The following commit(s) were added to refs/heads/master by this push:
     new 6387598e8 Use awk to substitute the right path of python.
6387598e8 is described below

commit 6387598e80295619ac3cf2524296d18d03852079
Author: ng0 <address@hidden>
AuthorDate: Fri May 31 08:22:27 2019 +0000

    Use awk to substitute the right path of python.
---
 configure.ac                                       |  7 +++++
 tests/.gitignore                                   |  5 ++++
 tests/Makefile.am                                  | 34 +++++++++++++++++++---
 tests/{curl_test_data.py => curl_test_data.py.in}  |  2 +-
 tests/{dictserver.py => dictserver.py.in}          |  2 +-
 .../{negtelnetserver.py => negtelnetserver.py.in}  |  2 +-
 tests/{smbserver.py => smbserver.py.in}            |  2 +-
 7 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0dfe18fc8..1c66317cf 100755
--- a/configure.ac
+++ b/configure.ac
@@ -3894,6 +3894,13 @@ AC_PATH_PROG( PERL, perl, ,
   $PATH:/usr/local/bin/perl:/usr/bin/:/usr/local/bin )
 AC_SUBST(PERL)
 
+# autotools' m4 for python has no maximum version!
+# python3.4 - python3.7 for tests
+m4_define_default([_AM_PYTHON_INTERPRETER_LIST],[python2.7 python3 python3.4 
python3.5 python3.6 python3.7 python])
+AM_PATH_PYTHON([2.7],, [:])
+AC_SUBST([PYTHON])
+AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
+
 AC_PATH_PROGS( NROFF, gnroff nroff, ,
   $PATH:/usr/bin/:/usr/local/bin )
 AC_SUBST(NROFF)
diff --git a/tests/.gitignore b/tests/.gitignore
index fbbc16485..80e90dbf5 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -17,3 +17,8 @@ runtests.html
 runtests.pdf
 testcurl.html
 testcurl.pdf
+
+dictserver.py
+smbserver.py
+curl_test_data.py
+negtelnetserver.py
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e2f757c4f..157d8cf48 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,17 +27,19 @@ IMP = python_dependencies/impacket
 SMBDEPS = $(IMP)/__init__.py $(IMP)/nmb.py $(IMP)/nt_errors.py          \
  $(IMP)/ntlm.py $(IMP)/smb.py $(IMP)/smb3.py $(IMP)/smb3structs.py      \
  $(IMP)/smbserver.py $(IMP)/spnego.py $(IMP)/structure.py               \
- $(IMP)/uuid.py $(IMP)/version.py smbserver.py curl_test_data.py
+ $(IMP)/uuid.py $(IMP)/version.py smbserver.py.in curl_test_data.py.in
 
 EXTRA_DIST = ftpserver.pl httpserver.pl secureserver.pl runtests.pl           \
  getpart.pm FILEFORMAT README stunnel.pem memanalyze.pl testcurl.pl           \
  valgrind.pm ftp.pm sshserver.pl sshhelp.pm pathhelp.pm testcurl.1 runtests.1 \
  serverhelp.pm tftpserver.pl rtspserver.pl directories.pm symbol-scan.pl      \
  CMakeLists.txt mem-include-scan.pl valgrind.supp extern-scan.pl              \
- manpage-scan.pl nroff-scan.pl http2-server.pl dictserver.py                  \
- negtelnetserver.py $(SMBDEPS) objnames-test08.sh objnames-test10.sh          \
+ manpage-scan.pl nroff-scan.pl http2-server.pl dictserver.py.in                
  \
+ negtelnetserver.py.in $(SMBDEPS) objnames-test08.sh objnames-test10.sh        
  \
  objnames.inc
 
+check_SCRIPTS = smbserver.py curl_test_data.py negtelnetserver.py dictserver.py
+
 DISTCLEANFILES = configurehelp.pm
 
 # we have two variables here to make sure DIST_SUBDIRS won't get 'unit'
@@ -58,6 +60,30 @@ PERLFLAGS = -I$(srcdir)
 
 CLEANFILES = .http.pid .https.pid .ftp.pid .ftps.pid $(MANDISTPAGES)
 
+do_subst = $(AWK) -v python=$(PYTHON) '{gsub("AWKPYTHON",python,$$0); print 
$$0}'
+
+SUFFIXES = .py.in .py
+
+.py.in.py:
+       $(do_subst) < $< > $@
+       @chmod +x $@
+
+smbserver.py: smbserver.py.in Makefile
+       $(do_subst) < $(srcdir)/smbserver.py.in > smbserver.py
+       @chmod +x smbserver.py
+
+curl_test_data.py: curl_test_data.py.in Makefile
+       $(do_subst) < $(srcdir)/curl_test_data.py.in > curl_test_data.py
+       @chmod +x curl_test_data.py
+
+negtelnetserver.py: negtelnetserver.py.in Makefile
+       $(do_subst) < $(srcdir)/negtelnetserver.py.in > negtelnetserver.py
+       @chmod +x negtelnetserver.py
+
+dictserver.py: dictserver.py.in Makefile
+       $(do_subst) < $(srcdir)/dictserver.py.in > dictserver.py
+       @chmod +x dictserver.py
+
 curl:
        @cd $(top_builddir) && $(MAKE)
 
@@ -79,7 +105,7 @@ endif
 perlcheck:
        @if ! test -x "$(PERL)"; then echo "No perl!"; exit 2; fi
 
-test: perlcheck all
+test: perlcheck all $(check_SCRIPTS)
        $(TEST) $(TFLAGS)
 
 quiet-test: perlcheck all
diff --git a/tests/curl_test_data.py b/tests/curl_test_data.py.in
similarity index 98%
rename from tests/curl_test_data.py
rename to tests/curl_test_data.py.in
index 21747407d..6928b2c2b 100755
--- a/tests/curl_test_data.py
+++ b/tests/curl_test_data.py.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!AWKPYTHON
 # -*- coding: utf-8 -*-
 #
 #  Project                     ___| | | |  _ \| |
diff --git a/tests/dictserver.py b/tests/dictserver.py.in
similarity index 99%
rename from tests/dictserver.py
rename to tests/dictserver.py.in
index a41a8a0d6..5a8dc3ed4 100755
--- a/tests/dictserver.py
+++ b/tests/dictserver.py.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!AWKPYTHON
 # -*- coding: utf-8 -*-
 #
 """ DICT server """
diff --git a/tests/negtelnetserver.py b/tests/negtelnetserver.py.in
similarity index 99%
rename from tests/negtelnetserver.py
rename to tests/negtelnetserver.py.in
index f2f2ab500..1d9459926 100755
--- a/tests/negtelnetserver.py
+++ b/tests/negtelnetserver.py.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!AWKPYTHON
 # -*- coding: utf-8 -*-
 #
 """ A telnet server which negotiates"""
diff --git a/tests/smbserver.py b/tests/smbserver.py.in
similarity index 99%
rename from tests/smbserver.py
rename to tests/smbserver.py.in
index 195ae395b..1d2a1fc3f 100755
--- a/tests/smbserver.py
+++ b/tests/smbserver.py.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!AWKPYTHON
 # -*- coding: utf-8 -*-
 #
 #  Project                     ___| | | |  _ \| |

-- 
To stop receiving notification emails like this one, please contact
address@hidden