tests: expose automake bug#14560

[platform/upstream/automake.git] / t / cond42.sh

diff --git a/t/cond42.sh b/t/cond42.sh
old mode 100755 (executable)
new mode 100644 (file)
index d4eee01..9f788c9
--- a/t/cond42.sh
+++ b/t/cond42.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
-# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+nfig
+# Copyright (C) 2008-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
@@ -18,7 +19,7 @@
 # This shouldn't happen with user input, as _AM_COND_* are not documented,
 # but better to be safe.
 
-. ./defs || Exit 1
+. test-init.sh
 
 cat >>configure.ac <<'END'
 AM_CONDITIONAL([COND], [:])
@@ -28,10 +29,10 @@ _AM_COND_IF([COND])
 AC_OUTPUT
 END
 
-edit_configure_in ()
+edit_configure_ac ()
 {
-  sed "$@" < configure.ac >configure.int
-  mv -f configure.int configure.ac
+  sed "$@" < configure.ac >configure.tmp
+  mv -f configure.tmp configure.ac
   rm -rf autom4te*.cache
 }
 
@@ -41,19 +42,19 @@ $ACLOCAL
 AUTOMAKE_fails
 grep '^configure\.ac:8:.* condition stack' stderr
 
-edit_configure_in 's/_AM_COND_IF/_AM_COND_ELSE/'
+edit_configure_ac 's/_AM_COND_IF/_AM_COND_ELSE/'
 AUTOMAKE_fails
 grep '^configure\.ac:7:.* else without if' stderr
 
-edit_configure_in 's/_AM_COND_ELSE/_AM_COND_ENDIF/'
+edit_configure_ac 's/_AM_COND_ELSE/_AM_COND_ENDIF/'
 AUTOMAKE_fails
 grep '^configure\.ac:7:.* endif without if' stderr
 
-edit_configure_in 's/\(_AM_COND_ENDIF\).*/_AM_COND_IF\
+edit_configure_ac 's/\(_AM_COND_ENDIF\).*/_AM_COND_IF\
 _AM_COND_ENDIF/'
 AUTOMAKE_fails
 grep '^configure\.ac:7:.* not enough arguments.* _AM_COND_IF' stderr
 grep '^configure\.ac:8:.* not enough arguments.* _AM_COND_ENDIF' stderr
-test 2 = `grep -c 'not enough arguments' stderr`
+test 2 -eq $($FGREP -c 'not enough arguments' stderr)
 
 :