diff options
| author | Adam Disney <adisney1@vols.utk.edu> | 2014-06-16 12:27:19 -0400 |
|---|---|---|
| committer | Adam Disney <adisney1@vols.utk.edu> | 2014-06-16 12:27:19 -0400 |
| commit | 5be1fecbcb8bc7fc2370185ec9faa36ae367b58a (patch) | |
| tree | 4f9c2f4057500c5f6bd4ec1e09c85dee0e097f12 | |
| parent | d08de3bdcb80748f884850db4cdb4630148c2398 (diff) | |
| download | gf-complete-5be1fecbcb8bc7fc2370185ec9faa36ae367b58a.tar.gz | |
Fixed a few minor warnings when running autogen.sh.
| -rw-r--r-- | examples/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rwxr-xr-x | test-driver | 20 | ||||
| -rw-r--r-- | test/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 2 |
5 files changed, 8 insertions, 20 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index fa8ca5a..fd547d2 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,6 +1,6 @@ # GF-Complete 'examples' AM file -INCLUDES=-I./ -I../include +AM_CPPFLAGS=-I./ -I../include AM_CFLAGS = -O3 $(SIMD_FLAGS) -fPIC $(INCLUDES) bin_PROGRAMS = gf_example_1 gf_example_2 gf_example_3 gf_example_4 \ diff --git a/src/Makefile.am b/src/Makefile.am index 4dee612..ba3ad5e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ # GF-Complete 'core' AM file # Creates the library -INCLUDES=-I./ -I../include +AM_CPPFLAGS=-I./ -I../include AM_CFLAGS = -O3 $(SIMD_FLAGS) -fPIC $(INCLUDES) lib_LTLIBRARIES = libgf_complete.la diff --git a/test-driver b/test-driver index d306056..32bf39e 100755 --- a/test-driver +++ b/test-driver @@ -1,7 +1,7 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2013-07-13.22; # UTC +scriptversion=2012-06-27.10; # UTC # Copyright (C) 2011-2013 Free Software Foundation, Inc. # @@ -44,12 +44,13 @@ 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 [TEST-SCRIPT-ARGUMENTS] + [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT 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. @@ -68,23 +69,10 @@ 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. diff --git a/test/Makefile.am b/test/Makefile.am index 443fc3e..7f39a48 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,6 +1,6 @@ # GF-Complete 'test' AM file -INCLUDES=-I./ -I../include +AM_CPPFLAGS=-I./ -I../include AM_CFLAGS = -O3 $(SIMD_FLAGS) -fPIC $(INCLUDES) bin_PROGRAMS = gf_unit diff --git a/tools/Makefile.am b/tools/Makefile.am index 9e7c564..7c55d65 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,6 +1,6 @@ # GF-Complete 'tools' AM file -INCLUDES=-I./ -I../include +AM_CPPFLAGS=-I./ -I../include AM_CFLAGS = -O3 $(SIMD_FLAGS) -fPIC $(INCLUDES) TESTS=run-tests.sh |