[src/trunk]: src/tests/usr.bin/make undo previous bogus merge of PR49085

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/75eb19bfcfc7
branches:  trunk
changeset: 331764:75eb19bfcfc7
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Aug 23 15:10:18 2014 +0000

description:
undo previous bogus merge of PR49085

diffstat:

 tests/usr.bin/make/t_make.sh |  28 ++++++----------------------
 1 files changed, 6 insertions(+), 22 deletions(-)

diffs (43 lines):

diff -r dc921a35f61b -r 75eb19bfcfc7 tests/usr.bin/make/t_make.sh
--- a/tests/usr.bin/make/t_make.sh      Sat Aug 23 15:05:40 2014 +0000
+++ b/tests/usr.bin/make/t_make.sh      Sat Aug 23 15:10:18 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_make.sh,v 1.4 2014/08/23 15:05:41 christos Exp $
+# $NetBSD: t_make.sh,v 1.5 2014/08/23 15:10:18 christos Exp $
 #
 # Copyright (c) 2008, 2010, 2014 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -32,28 +32,12 @@
        local makename="${1}"; shift
 
        local srcdir="$(atf_get_srcdir)"
-       local in="${srcdir}/d_${name}.mk"
-       local out="${srcdir}/d_${name}.out"
+
+       local testdir="$(atf_get_srcdir)/unit-tests"
 
-       if [ "x${name}" = "xposix" ]; then
-               # Include $(INPUTFILE) for d_posix.mk, so it can re-run make
-               # on the same makefile.  Make sets $(MAKEFILE), but it is
-               # not in POSIX, so it can't be used as such.  It can't be
-               # set explicitly because make always sets it itself and
-               # the test shouldn't use anything not provided for by in
-               # the POSIX standard.
-               args="INPUTFILE='${in}'"
-               atf_expect_fail 'PR/49092 [output order]'
-               atf_check -o file:"${out}" -x \
-                   "make -kf'${in}' ${args} 2>&1 | sed -e 's,${srcdir}/d_,,'"
-       else
-               local testdir="$(atf_get_srcdir)/unit-tests"
-
-               atf_check -s exit:0 -o ignore -e ignore \
-               make -f "${testdir}/Makefile" "${makename}.out"
-               atf_check -o file:"${testdir}/${makename}.exp" \
-                   cat "${makename}.out"
-       fi
+       atf_check -s exit:0 -o ignore -e ignore \
+           make -f "${testdir}/Makefile" "${makename}.out"
+       atf_check -o file:"${testdir}/${makename}.exp" cat "${makename}.out"
 }
 
 # Defines a test case for make(1), parsing a given file and comparing the