summaryrefslogtreecommitdiff
path: root/tests/subobj2.test
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2010-06-27 16:34:42 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2010-08-10 19:39:21 +0200
commitc92e890ce35a5f8bbdebf47aab38ee7c0b8daa66 (patch)
treea4e9800e1bf50382ed748559dfb6dd82f2a7e524 /tests/subobj2.test
parent22dfae32e71dee267c5231a79b24426b18e3dd5e (diff)
downloadautomake-c92e890ce35a5f8bbdebf47aab38ee7c0b8daa66.tar.gz
Modernize, improve and extend tests `subobj*.test'.
* tests/subobjname.test: Add trailing `:' command. * tests/subobj.test: Make grepping of `Makefile.in' stricter. Escape literal dots in grep regexps. * tests/subobj2.test: Add trailing `:' command. Do not use the unportable fgrep option `-e'. * tests/subobj3.test: Add trailing `:' command. (configure.in): Use proper m4 quoting, and avoid obsolescent constructs. * tests/subobj8.test: Likewise. Also, enable `errexit' shell flag, with related changes * tests/subobj4.test: Likewise. Also, make grepping of `Makefile.in' stricter. * tests/subobj5.test: Add trailing `:' command. Move setting of `errexit' shell flag earlier in the script (just after inclusion of ./defs). (configure.in): Use the stub created by `./defs', rather than writing it from scratch, and avoid obsolescent constructs. * tests/subobj6.test: Add trailing `:' command. Move setting of `errexit' shell flag earlier in the script (just after inclusion of ./defs). Do not create useless dummy ac-init file `f'. * tests/subobj7.test: Do not create useless dummy ac-init file `f'. (configure.in): Use the stub created by `./defs', rather than writing it from scratch, and avoid obsolescent constructs. * tests/subobj9.test: Move setting of `errexit' shell flag earlier in the script (just after inclusion of ./defs). Fail the test if `make distcheck' fails. Ensure verbose printing of captured make stdout. Avoid uselsss fork by doing simple grep instead of using test -n "`COMMAND | grep ...`". (configure.in): Normalize the call to AC_INIT w.r.t. other tests. (Makefile.am): Explicitly mark target "print" as phony. * tests/subobj10.test: Removed duplicated call to `set -e'. Add trailing `:' command. (configure.in): Normalize the call to AC_INIT w.r.t. other tests.
Diffstat (limited to 'tests/subobj2.test')
-rwxr-xr-xtests/subobj2.test6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/subobj2.test b/tests/subobj2.test
index 1282f8086..87a467140 100755
--- a/tests/subobj2.test
+++ b/tests/subobj2.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2010 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
@@ -35,4 +35,6 @@ $AUTOMAKE
$FGREP 'generic/a.$(OBJEXT)' Makefile.in
grep '[^/]a\.\$(OBJEXT)' Makefile.in && Exit 1
-$FGREP -e '-c -o' Makefile.in
+grep '.*-c -o' Makefile.in
+
+: