Update run-test script with gmp/mini-gmp changes

diff --git a/ChangeLog b/ChangeLog
index d381e947ccf1efd9d8f7b2730f2e9c64f5d535a5..7659795092ad035a0a48512a6a95fd2bf551d898 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2020-11-28  Niels Möller  <nisse@lysator.liu.se>
+
+       Merge changes by Marco Bodrato and Torbjorn Granlund, from the
+       gmp/mini-gmp copy of this file.
+       * run-tests: Delete special handling of zero arguments. Update
+       WINEPATH, instead of overwriting it.
+
 2020-11-27  Niels Möller  <nisse@lysator.liu.se>
 
        * aclocal.m4: Replace some calls to exit with return, since exit

diff --git a/run-tests b/run-tests
index c44903f67699d2ff1d080eec0aa4a9b2ceb9e2ef..44c8c39aa2a2dcc0dcdefc227b1864498653861c 100755 (executable)
--- a/run-tests
+++ b/run-tests
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2011, 2012  Niels Möller
+# Copyright (C) 2000-2002, 2004, 2005, 2011, 2012, 2016, 2020  Niels Möller
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@ if [ -n "$TEST_SHLIB_DIR" ] ; then
   # For Windows
   PATH="${TEST_SHLIB_DIR}:${PATH}"
   # For Wine
-  WINEPATH="${TEST_SHLIB_DIR}"
+  WINEPATH="${TEST_SHLIB_DIR}${WINEPATH:+;$WINEPATH}"
 
   export LD_LIBRARY_PATH
   export DYLD_LIBRARY_PATH
@@ -54,6 +54,8 @@ find_program () {
        *)
          if [ -x "$1" ] ; then
              echo "./$1"
+         elif [ -x "$1.exe" ] ; then
+             echo "./$1.exe"
          else
              echo "$srcdir/$1"
          fi
@@ -116,11 +118,7 @@ do
   shift
 done
 
-if [ $# -eq 0 ] ; then
-  for f in *-test; do test_program "./$f"; done
-else
-  for f in "$@" ; do test_program `find_program "$f"`; done
-fi
+for f in "$@" ; do test_program `find_program "$f"`; done
 
 if [ $failed -eq 0 ] ; then
   banner="All $all tests passed"