Skip to content

Commit

Permalink
dervied files from bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
benkirk committed Jan 21, 2014
1 parent a07f4f4 commit 416de06
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 9 deletions.
7 changes: 4 additions & 3 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,10 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(top_srcdir)/contrib/utils/libmesh-opt.pc.in \
$(top_srcdir)/contrib/utils/libmesh-prof.pc.in \
$(top_srcdir)/doc/Doxyfile.in $(top_srcdir)/doc/dot.in AUTHORS \
COPYING ChangeLog INSTALL NEWS build-aux/config.guess \
build-aux/config.sub build-aux/depcomp build-aux/install-sh \
build-aux/ltmain.sh build-aux/missing build-aux/ylwrap
COPYING ChangeLog INSTALL NEWS build-aux/compile \
build-aux/config.guess build-aux/config.sub build-aux/depcomp \
build-aux/install-sh build-aux/ltmain.sh build-aux/missing \
build-aux/ylwrap
@LIBMESH_DBG_MODE_TRUE@am__append_1 = libmesh_dbg.la
@LIBMESH_DEVEL_MODE_TRUE@am__append_2 = libmesh_devel.la
@LIBMESH_OPT_MODE_TRUE@am__append_3 = libmesh_opt.la
Expand Down
24 changes: 18 additions & 6 deletions build-aux/test-driver
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#! /bin/sh
# test-driver - basic driver script for the 'parallel-tests' mode.
# test-driver - basic testsuite driver script.

scriptversion=2012-06-27.10; # UTC
scriptversion=2013-07-13.22; # UTC

# Copyright (C) 2011-2012 Free Software Foundation, Inc.
# Copyright (C) 2011-2013 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
Expand Down Expand Up @@ -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.
Expand All @@ -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='' # Red.
Expand Down
1 change: 1 addition & 0 deletions contrib/netcdf/4.3.0/configure
Original file line number Diff line number Diff line change
Expand Up @@ -2913,6 +2913,7 @@ ac_config_headers="$ac_config_headers config.h"


# This call is required by automake.
# AM_INIT_AUTOMAKE([foreign dist-xz dist-bzip2 color-tests subdir-objects 1.11])
am__api_version='1.12'

# Find a good install program. We prefer a C program (faster),
Expand Down

0 comments on commit 416de06

Please sign in to comment.