tests: remove too-brittle test tap-realtime.sh

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

diff --git a/t/fn99.sh b/t/fn99.sh
old mode 100755 (executable)
new mode 100644 (file)
index 900b36b..c01eac1
--- a/t/fn99.sh
+++ b/t/fn99.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-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 @@
 
 # Check the filename-length-max=99 option.
 
-. ./defs || Exit 1
+. test-init.sh
 
 echo AC_OUTPUT >> configure.ac
 
@@ -26,7 +26,7 @@ EXTRA_DIST = 12345678
 END
 
 (for i in 1 2 3 4 5 6 7 8 9; do
-  mkdir -p 12345678 && cd 12345678 && touch x || Exit 1
+  mkdir -p 12345678 && cd 12345678 && touch x || exit 1
 done) || skip_ "failed to create deep directory hierarchy"
 
 # AIX 5.3 'cp -R' is too buggy for 'make dist'.
@@ -40,12 +40,11 @@ $AUTOMAKE
 $MAKE distcheck
 
 (for i in 1 2 3 4 5 6 7 8 9 10 11; do
-  mkdir -p 12345678 && cd 12345678 && touch x || Exit 1
+  mkdir -p 12345678 && cd 12345678 && touch x || exit 1
 done) || skip_ "failed to create deeper directory hierarchy"
 
-$MAKE dist 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
+run_make -E -e FAIL dist
 grep 'filenames are too long' stderr
-test 2 = `grep 12345678 stderr | wc -l`
+test 2 -eq $(grep -c 12345678 stderr)
 
 :