Module Name: src
Committed By: christos
Date: Sat Aug 23 15:10:18 UTC 2014
Modified Files:
src/tests/usr.bin/make: t_make.sh
Log Message:
undo previous bogus merge of PR49085
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/make/t_make.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/make/t_make.sh
diff -u src/tests/usr.bin/make/t_make.sh:1.4 src/tests/usr.bin/make/t_make.sh:1.5
--- src/tests/usr.bin/make/t_make.sh:1.4 Sat Aug 23 11:05:41 2014
+++ src/tests/usr.bin/make/t_make.sh Sat Aug 23 11:10:18 2014
@@ -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 @@ run_and_check()
local makename="${1}"; shift
local srcdir="$(atf_get_srcdir)"
- local in="${srcdir}/d_${name}.mk"
- local out="${srcdir}/d_${name}.out"
- 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
+ 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"
}
# Defines a test case for make(1), parsing a given file and comparing the
