Move run-test to gnulib.

3 files changed, 8 insertions, 139 deletions

diff --git a/ChangeLog b/ChangeLog
index 2920a3a..887fc45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
+2019-02-04  Bruno Haible  <bruno@clisp.org>
+
+	Move run-test to gnulib.
+	* autogen.sh: Copy build-aux/run-test from gnulib.
+	* build-aux/run-test: Remove file.
+
 2019-02-03  Bruno Haible  <bruno@clisp.org>
 
 	Move declared.sh to gnulib.
 	* autogen.sh: Copy lib/declared.sh from gnulib.
+	* lib/declared.sh: Remove file.
 
 2019-01-28  Bruno Haible  <bruno@clisp.org>
 
diff --git a/autogen.sh b/autogen.sh
index f8b2fe3..489fcfb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -459,6 +459,7 @@ if test $skip_gnulib = false; then
     $GNULIB_TOOL --copy-file build-aux/config.guess; chmod a+x build-aux/config.guess
     $GNULIB_TOOL --copy-file build-aux/config.sub;   chmod a+x build-aux/config.sub
     $GNULIB_TOOL --copy-file build-aux/declared.sh lib/declared.sh; chmod a+x lib/declared.sh
+    $GNULIB_TOOL --copy-file build-aux/run-test; chmod a+x build-aux/run-test
     $GNULIB_TOOL --copy-file build-aux/test-driver.diff
     # If we got no texinfo.tex so far, take the snapshot from gnulib.
     if test ! -f build-aux/texinfo.tex; then
diff --git a/build-aux/run-test b/build-aux/run-test
deleted file mode 100755
index 38e0493..0000000
--- a/build-aux/run-test
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2009-2018 Free Software Foundation, Inc.
-#
-# 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
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#
-
-# This program is a test driver that supports running a test under valgrind.
-# Usage: run-test CHECKER PROGRAM [ARGUMENT...]
-
-progname=$0
-
-# func_usage
-# outputs to stdout the --help usage message.
-func_usage ()
-{
-  echo "\
-Usage: run-test [OPTION...] CHECKER PROGRAM [ARGUMENT...]
-
-Runs PROGRAM under the control of CHECKER.
-
-CHECKER may be empty or a valgrind command with some options, such as
-'valgrind --tool=memcheck --num-callers=20 --leak-check=yes --leak-resolution=high --show-reachable=yes'.
-
-When CHECKER is not empty, it is recommended that the package has been
-configured with
-  --disable-shared     so that tests are real executables and not libtool
-                       wrapper scripts, and
-  CFLAGS=\"-g\"          so that valgrind shows line numbers.
-
-Report bugs to Bruno Haible."
-}
-
-# func_version
-# outputs to stdout the --version message.
-func_version ()
-{
-  echo "\
-run-test (GNU libunistring)
-Copyright (C) 2009-2018 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.
-
-Written by" "Bruno Haible"
-}
-
-# func_fatal_error message
-# outputs to stderr a fatal error message, and terminates the program.
-# Input:
-# - progname                 name of this program
-func_fatal_error ()
-{
-  echo "$progname: *** $1" 1>&2
-  echo "$progname: *** Stop." 1>&2
-  func_exit 1
-}
-
-# Command-line option processing.
-# Removes the OPTIONS from the arguments. Sets the variables:
-# - checker        wrapper program for executables
-{
-  while test $# -gt 0; do
-    case "$1" in
-      --help | --hel | --he | --h )
-        func_usage
-        exit $? ;;
-      --version | --versio | --versi | --vers | --ver | --ve | --v )
-        func_version
-        exit $? ;;
-      -- )
-        # Stop option processing
-        shift
-        break ;;
-      -* )
-        echo "run-test: unknown option $1" 1>&2
-        echo "Try 'run-test --help' for more information." 1>&2
-        exit 1 ;;
-      * )
-        break ;;
-    esac
-  done
-
-  if test $# -lt 2; then
-    echo "run-test: too few arguments" 1>&2
-    echo "Try 'run-test --help' for more information." 1>&2
-    exit 1
-  fi
-
-  checker="$1"
-  shift
-}
-
-if test -z "$checker"; then
-  # No checker. Run the test directly.
-  exec "$@"
-else
-  # Using valgrind. We want to apply valgrind only to executables, not to
-  # shell script, because
-  # 1. we don't want to look for memory leaks in bash,
-  # 2. on a bi-arch system, we would get an error message such as
-  #    "valgrind: wrong executable class (eg. 32-bit instead of 64-bit)".
-  case "$1" in
-    *.sh)
-      # A shell script. Ignore the checker.
-      exec "$@"
-      ;;
-    *)
-      # The 'file' command is not portable enough. So, look
-      # at the first two bytes of the file. Are they '#!'?
-      if { if od -A x < /dev/null >/dev/null 2>/dev/null; then
-             # Use POSIX od.
-             firstbytes=`od -A n -t o1 -N 2 < "$1" | tr -d ' '`
-           else
-             # Use BSD hexdump.
-             firstbytes=`dd if="$1" bs=1 count=2 2>/dev/null | hexdump -e '1/1 "%03o"'`
-           fi
-           test "$firstbytes" = "043041"
-         }; then
-        # A shell script. Ignore the checker.
-        exec "$@"
-      else
-        # An executable. Use the checker.
-        exec $checker "$@"
-      fi
-      ;;
-  esac
-fi