tests: avoid a spurious failure on MSYS

[platform/upstream/automake.git] / t / pr300-ltlib.sh

diff --git a/t/pr300-ltlib.sh b/t/pr300-ltlib.sh
old mode 100755 (executable)
new mode 100644 (file)
index 1495b0b..3994e36
--- a/t/pr300-ltlib.sh
+++ b/t/pr300-ltlib.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-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 +18,7 @@
 # PR/300
 
 required='cc libtoolize'
-. ./defs || Exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
@@ -52,29 +52,27 @@ cwd=$(pwd) || fatal_ "getting current working directory"
 ./configure --prefix "$cwd/inst" --libdir "$cwd/inst/lib"
 
 # A rule in the Makefile should create subdir.
-test ! -d subdir
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
+test ! -e subdir
+run_make -O
 test -d subdir
 
 grep 'liba.la .*-rpath .*lib' stdout
-grep 'liba.la .*-rpath .*lib/subdir' stdout && Exit 1
+grep 'liba.la .*-rpath .*lib/subdir' stdout && exit 1
 grep 'libb.la .*-rpath .*lib/subdir' stdout
 
 test -f subdir/liba.la
 test -f subdir/libb.la
 
-$MAKE install 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'remember.*--finish' stderr && Exit 1
+run_make -E install
+grep 'remember.*--finish' stderr && exit 1
 
 test -f inst/lib/liba.la
 test -f inst/lib/subdir/libb.la
 
 $MAKE uninstall
 
-test -f inst/lib/liba.la && Exit 1
-test -f inst/lib/subdir/libb.la && Exit 1
+test -f inst/lib/liba.la && exit 1
+test -f inst/lib/subdir/libb.la && exit 1
 
 $MAKE install-strip