From 4dbcd1d8313e56842e6068bbb9b00124a3b82e25 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niels=20M=C3=B6ller?= Date: Sat, 28 Nov 2020 11:54:55 +0100 Subject: [PATCH] Update run-test script with gmp/mini-gmp changes --- ChangeLog | 7 +++++++ run-tests | 12 +++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index d381e947..76597950 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2020-11-28 Niels Möller + + 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 * aclocal.m4: Replace some calls to exit with return, since exit diff --git a/run-tests b/run-tests index c44903f6..44c8c39a 100755 --- 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" -- 2.47.2