| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051 |
- --- util-linux-2.25.2.orig/config/test-driver 2013-08-05 05:10:38.000000000 -0500
- +++ util-linux-2.25.2/config/test-driver 2014-12-27 12:19:32.871521679 -0600
- @@ -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.
|
