diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | modules/dfa | 1 | ||||
| -rw-r--r-- | modules/dfa-tests | 2 | ||||
| -rwxr-xr-x | tests/dfa-match.sh | 8 |
4 files changed, 18 insertions, 3 deletions
@@ -1,3 +1,13 @@ +2016-09-11 Paul Eggert <eggert@cs.ucla.edu> + + dfa: port to Solaris 9 + Problems reported by Tom G. Christensen in: + http://lists.gnu.org/archive/html/bug-gnulib/2016-09/msg00031.html + * modules/dfa (Depends-on): Add isblank. + * modules/dfa-tests (dfa_match_aux_LDADD): + Rename from test_stat_LDADD, to fix typo. + * tests/dfa-match.sh: Don't require 'timeout'; use it if available. + 2016-09-10 Jim Meyering <meyering@fb.com> strverscmp: avoid link failure on OS X diff --git a/modules/dfa b/modules/dfa index 5708ed1385..e95035a633 100644 --- a/modules/dfa +++ b/modules/dfa @@ -10,6 +10,7 @@ lib/localeinfo.h Depends-on: assert ctype +isblank locale regex stdbool diff --git a/modules/dfa-tests b/modules/dfa-tests index 6a64ff92e3..9f00d8125d 100644 --- a/modules/dfa-tests +++ b/modules/dfa-tests @@ -18,4 +18,4 @@ TESTS += \ dfa-match.sh check_PROGRAMS += dfa-match-aux -test_stat_LDADD = $(LDADD) $(LIBINTL) +dfa_match_aux_LDADD = $(LDADD) @LIBINTL@ diff --git a/tests/dfa-match.sh b/tests/dfa-match.sh index e9efd47551..5da1985ce3 100755 --- a/tests/dfa-match.sh +++ b/tests/dfa-match.sh @@ -21,7 +21,11 @@ # Add "." to PATH for the use of dfa-match-aux. path_prepend_ . -require_timeout_ +if (type timeout) >/dev/null 2>&1; then + timeout_10='timeout 10' +else + timeout_10= +fi fail=0 @@ -29,7 +33,7 @@ dfa-match-aux a ba 0 > out || fail=1 compare /dev/null out || fail=1 in=$(printf "bb\nbb") -timeout 10 dfa-match-aux a "$in" 1 > out || fail=1 +$timeout_10 dfa-match-aux a "$in" 1 > out || fail=1 compare /dev/null out || fail=1 Exit $fail |