maint: avoid syntax-check failures

* maintainer/syntax-checks.mk (toupper): Tighten the regexp
to avoid a new false-match in t/python-prefix.sh.
* t/instmany-python.sh: Use run_make in place of some $MAKE uses.
* t/python-prefix.sh: Likewise.
* t/python-vars.sh: Likewise.

diff --git a/maintainer/syntax-checks.mk b/maintainer/syntax-checks.mk
index bf564a7100f087ba9b5379c9ae2c8cc18eb23747..56f853888b21820039608e9d6989b59b7a986047 100644 (file)
--- a/maintainer/syntax-checks.mk
+++ b/maintainer/syntax-checks.mk
@@ -415,7 +415,7 @@ sc_tests_overriding_macros_on_cmdline:
                -e 's/ exp="[^"]*"/ /' \
                -e 's/ exp=[^ ]/ /' \
              $(filter-out %/am-test-lib.sh,$(xtests)) \
-               | grep '\$$MAKE .*='; then \
+               | grep -E '\$$MAKE .*\S+='; then \
          echo 'Rewrite "$$MAKE foo=bar" as "run_make foo=bar" in the lines above,'; \
          echo 'it is more portable.'; \
          exit 1; \

diff --git a/t/instmany-python.sh b/t/instmany-python.sh
index 8b90c78d0eb3b663a845cd6eb757feab606f601e..ed32d307f543de7189d095d58cd5dad7e3e68cdf 100644 (file)
--- a/t/instmany-python.sh
+++ b/t/instmany-python.sh
@@ -119,11 +119,11 @@ cd build
 test -n "$orig_INSTALL"
 $MAKE
 # Try whether native install (or install-sh) works.
-$MAKE install PYTHON_PREFIX="$instdir"
+run_make install PYTHON_PREFIX="$instdir"
 test -n "$(find "$instdir" -name python1.py)"
 # Multiple uninstall should work, too.
-$MAKE uninstall PYTHON_PREFIX="$instdir"
-$MAKE uninstall PYTHON_PREFIX="$instdir"
+run_make uninstall PYTHON_PREFIX="$instdir"
+run_make uninstall PYTHON_PREFIX="$instdir"
 test $(find "$instdir" -type f -print | wc -l) -eq 0
 
 # Try whether we don't exceed the low limit.
@@ -143,14 +143,14 @@ for file in python3.py python$nfiles.py
 do
   chmod a-r $srcdir/$file
   test ! -r $srcdir/$file || skip_ "cannot drop file read permissions"
-  $MAKE install PYTHON_PREFIX="$instdir" && exit 1
+  run_make install PYTHON_PREFIX="$instdir" && exit 1
   chmod u+r $srcdir/$file
 done
 
 for file in npython3.py npython$nfiles.py
 do
   chmod a-r $srcdir/$file
-  $MAKE install PYTHON_PREFIX="$instdir" && exit 1
+  run_make install PYTHON_PREFIX="$instdir" && exit 1
   chmod u+r $srcdir/$file
 done
 

diff --git a/t/python-prefix.sh b/t/python-prefix.sh
index f6a2d9bf3b873d1f5d85356c0869b28b9da7102b..3179d42e57496f8b3dc27c4def4869e943575962 100755 (executable)
--- a/t/python-prefix.sh
+++ b/t/python-prefix.sh
@@ -67,7 +67,7 @@ py_installed "$py_inst_site"/one.pyc
 py_installed "$py_inst_site"/python-prefix/pkgtwo.py
 py_installed "$py_inst_site"/python-prefix/pkgtwo.pyc
 #
-test "`$MAKE echo-python-exec-prefix`" = "$(pwd)/inst"
+test "$($MAKE echo-python-exec-prefix)" = "$(pwd)/inst"
 
 # \f Second test: specify different --with-python_prefix
 # and --with-python_exec_prefix values.
@@ -86,6 +86,6 @@ py_installed "$py_inst_site"/one.pyc
 py_installed "$py_inst_site"/python-prefix/pkgtwo.py
 py_installed "$py_inst_site"/python-prefix/pkgtwo.pyc
 #
-test "`$MAKE echo-python-exec-prefix`" = "$(pwd)/instexec"
+test "$($MAKE echo-python-exec-prefix)" = "$(pwd)/instexec"
 
 :

diff --git a/t/python-vars.sh b/t/python-vars.sh
index dedee0455a48abb43e516726e54df95e3f941236..9070c7501ed61bda27ccfc4217067b7b6555367a 100644 (file)
--- a/t/python-vars.sh
+++ b/t/python-vars.sh
@@ -28,7 +28,7 @@ CONFIG_SITE=/dev/null; export CONFIG_SITE
 # python installations, so we need more relaxed and ad-hoc checks for
 # them. Also, more proper "functional" checks on them should be done in
 # the 'python-virtualenv.sh' test.
-# 
+#
 # This version identification is duplicated in python.m4 (and the manual).
 PYTHON_VERSION=$($PYTHON -c 'import sys; print ("%u.%u" % sys.version_info[:2])') || exit 1
 PYTHON_PLATFORM=$($PYTHON -c 'import sys; print (sys.platform)') || exit 1
@@ -107,6 +107,6 @@ $MAKE test-in test-am
 # This tries to install to $PYTHON_PREFIX, which may not be writable.
 # Override it to something safe, but then of course we have to skip
 # checking that it is what we originally set it to.
-$MAKE distcheck PYTHON_PREFIX="$instdir" NO_CHECK_PYTHON_PREFIX=1
+run_make distcheck PYTHON_PREFIX="$instdir" NO_CHECK_PYTHON_PREFIX=1
 
 :