Commit 5be1fecbcb8bc7fc2370185ec9faa36ae367b58a

Authored by Adam Disney
1 parent d08de3bd
Exists in master and in 2 other branches v2, v3

Fixed a few minor warnings when running autogen.sh.

examples/Makefile.am
1 1 # GF-Complete 'examples' AM file
2 2  
3   -INCLUDES=-I./ -I../include
  3 +AM_CPPFLAGS=-I./ -I../include
4 4 AM_CFLAGS = -O3 $(SIMD_FLAGS) -fPIC $(INCLUDES)
5 5  
6 6 bin_PROGRAMS = gf_example_1 gf_example_2 gf_example_3 gf_example_4 \
... ...
src/Makefile.am
1 1 # GF-Complete 'core' AM file
2 2 # Creates the library
3 3  
4   -INCLUDES=-I./ -I../include
  4 +AM_CPPFLAGS=-I./ -I../include
5 5 AM_CFLAGS = -O3 $(SIMD_FLAGS) -fPIC $(INCLUDES)
6 6  
7 7 lib_LTLIBRARIES = libgf_complete.la
... ...
test-driver
1 1 #! /bin/sh
2 2 # test-driver - basic testsuite driver script.
3 3  
4   -scriptversion=2013-07-13.22; # UTC
  4 +scriptversion=2012-06-27.10; # UTC
5 5  
6 6 # Copyright (C) 2011-2013 Free Software Foundation, Inc.
7 7 #
... ... @@ -44,12 +44,13 @@ print_usage ()
44 44 Usage:
45 45 test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
46 46 [--expect-failure={yes|no}] [--color-tests={yes|no}]
47   - [--enable-hard-errors={yes|no}] [--]
48   - TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
  47 + [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
49 48 The '--test-name', '--log-file' and '--trs-file' options are mandatory.
50 49 END
51 50 }
52 51  
  52 +# TODO: better error handling in option parsing (in particular, ensure
  53 +# TODO: $log_file, $trs_file and $test_name are defined).
53 54 test_name= # Used for reporting.
54 55 log_file= # Where to save the output of the test script.
55 56 trs_file= # Where to save the metadata of the test run.
... ... @@ -68,23 +69,10 @@ while test $# -gt 0; do
68 69 --enable-hard-errors) enable_hard_errors=$2; shift;;
69 70 --) shift; break;;
70 71 -*) usage_error "invalid option: '$1'";;
71   - *) break;;
72 72 esac
73 73 shift
74 74 done
75 75  
76   -missing_opts=
77   -test x"$test_name" = x && missing_opts="$missing_opts --test-name"
78   -test x"$log_file" = x && missing_opts="$missing_opts --log-file"
79   -test x"$trs_file" = x && missing_opts="$missing_opts --trs-file"
80   -if test x"$missing_opts" != x; then
81   - usage_error "the following mandatory options are missing:$missing_opts"
82   -fi
83   -
84   -if test $# -eq 0; then
85   - usage_error "missing argument"
86   -fi
87   -
88 76 if test $color_tests = yes; then
89 77 # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
90 78 red='' # Red.
... ...
test/Makefile.am
1 1 # GF-Complete 'test' AM file
2 2  
3   -INCLUDES=-I./ -I../include
  3 +AM_CPPFLAGS=-I./ -I../include
4 4 AM_CFLAGS = -O3 $(SIMD_FLAGS) -fPIC $(INCLUDES)
5 5  
6 6 bin_PROGRAMS = gf_unit
... ...
tools/Makefile.am
1 1 # GF-Complete 'tools' AM file
2 2  
3   -INCLUDES=-I./ -I../include
  3 +AM_CPPFLAGS=-I./ -I../include
4 4 AM_CFLAGS = -O3 $(SIMD_FLAGS) -fPIC $(INCLUDES)
5 5  
6 6 TESTS=run-tests.sh
... ...