diff options
author | Colin Watson <cjwatson@debian.org> | 2014-01-23 12:07:42 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-01-23 12:07:42 +0000 |
commit | ba94d52d226f9adf9c0f4e0345caf1f14e186c3b (patch) | |
tree | 41e10985db980fdd6caa1b05a7fe267b7c7310e7 /tools | |
parent | aaf9ff69601d5f03d4139045f2b8493295b77668 (diff) |
Upgrade to Automake 1.14.1 and Libtool 2.4.2-1.6 (from Debian).
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile.in | 2 | ||||
-rw-r--r-- | tools/ltmain.sh | 4 | ||||
-rwxr-xr-x | tools/missing | 4 | ||||
-rwxr-xr-x | tools/test-driver | 20 |
4 files changed, 21 insertions, 9 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index f5907bbc..129d21fd 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.14 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. diff --git a/tools/ltmain.sh b/tools/ltmain.sh index 68c6d96c..9fe8f59d 100644 --- a/tools/ltmain.sh +++ b/tools/ltmain.sh @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.3 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.6 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.3" +VERSION="2.4.2 Debian-2.4.2-1.6" TIMESTAMP="" package_revision=1.3337 diff --git a/tools/missing b/tools/missing index cdea5149..db98974f 100755 --- a/tools/missing +++ b/tools/missing @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -160,7 +160,7 @@ give_advice () ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff --git a/tools/test-driver b/tools/test-driver index 32bf39e8..d3060566 100755 --- a/tools/test-driver +++ b/tools/test-driver @@ -1,7 +1,7 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2012-06-27.10; # UTC +scriptversion=2013-07-13.22; # UTC # Copyright (C) 2011-2013 Free Software Foundation, Inc. # @@ -44,13 +44,12 @@ print_usage () Usage: test-driver --test-name=NAME --log-file=PATH --trs-file=PATH [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT + [--enable-hard-errors={yes|no}] [--] + TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] The '--test-name', '--log-file' and '--trs-file' options are mandatory. END } -# TODO: better error handling in option parsing (in particular, ensure -# TODO: $log_file, $trs_file and $test_name are defined). test_name= # Used for reporting. log_file= # Where to save the output of the test script. trs_file= # Where to save the metadata of the test run. @@ -69,10 +68,23 @@ while test $# -gt 0; do --enable-hard-errors) enable_hard_errors=$2; shift;; --) shift; break;; -*) usage_error "invalid option: '$1'";; + *) break;; esac shift done +missing_opts= +test x"$test_name" = x && missing_opts="$missing_opts --test-name" +test x"$log_file" = x && missing_opts="$missing_opts --log-file" +test x"$trs_file" = x && missing_opts="$missing_opts --trs-file" +if test x"$missing_opts" != x; then + usage_error "the following mandatory options are missing:$missing_opts" +fi + +if test $# -eq 0; then + usage_error "missing argument" +fi + if test $color_tests = yes; then # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. red='[0;31m' # Red. |