tests: cosmetic changes in t/extra-sources.sh

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

diff --git a/t/vartypos.sh b/t/vartypos.sh
old mode 100755 (executable)
new mode 100644 (file)
index eb924cc..8e0e38b
--- a/t/vartypos.sh
+++ b/t/vartypos.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-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
@@ -16,7 +16,7 @@
 
 # Make sure we warn about possible variable typos when we should.
 
-. ./defs || Exit 1
+. test-init.sh
 
 cat >>configure.ac <<'END'
 AC_PROG_RANLIB
@@ -72,8 +72,8 @@ AUTOMAKE_fails -Wno-extra-portability
 # Makefile.am:13: library has 'libfoo_a' as canonical name (possible typo)
 
 grep 'as canonical' stderr | grep -v ' .foo. ' | grep -v ' .libfoo_a. ' \
-  && Exit 1
-test `grep 'variable.*is defined but' stderr | wc -l` = 13
+  && exit 1
+test $(grep -c 'variable.*is defined but' stderr) -eq 13
 
 # If we add a global -Wnone, all warnings should disappear.
 $AUTOMAKE -Wnone