summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2019-03-17 12:20:09 +0000
committerrillig <rillig@pkgsrc.org>2019-03-17 12:20:09 +0000
commit2a76ee8051fb7b919776adcaaf8b6ad00efe4511 (patch)
tree371995ad295ac1b834489d35b5fb327f701bcb02 /regress
parent10fe4508d732ade44dd90404420f0ea3758a7163 (diff)
downloadpkgsrc-2a76ee8051fb7b919776adcaaf8b6ad00efe4511.tar.gz
regress/compiler: fix regression test
Diffstat (limited to 'regress')
-rw-r--r--regress/compiler/files/Makefile6
-rw-r--r--regress/compiler/spec6
2 files changed, 5 insertions, 7 deletions
diff --git a/regress/compiler/files/Makefile b/regress/compiler/files/Makefile
index a84217e4e58..3cd6e6c5ca5 100644
--- a/regress/compiler/files/Makefile
+++ b/regress/compiler/files/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2007/03/08 14:31:06 rillig Exp $
+# $NetBSD: Makefile,v 1.2 2019/03/17 12:20:09 rillig Exp $
#
all: \
@@ -9,10 +9,8 @@ all: \
test-preprocessor:
# Test whether CPP is a C preprocessor.
${CPP} language.c | grep Cplain
-.if defined(CXXCPP)
# Test whether CXXCPP is a C++ preprocessor.
- ${CXXCPP} language.cc | grep Cplus
-.endif
+ ${CXXCPP:U${CXX} -E} language.cc | grep Cplus
test-wrapper:
# Test whether white-space is preserved in macro definitions.
diff --git a/regress/compiler/spec b/regress/compiler/spec
index 00c555f0d35..42c283e0259 100644
--- a/regress/compiler/spec
+++ b/regress/compiler/spec
@@ -1,4 +1,4 @@
-# $NetBSD: spec,v 1.1 2006/07/11 05:03:11 rillig Exp $
+# $NetBSD: spec,v 1.2 2019/03/17 12:20:09 rillig Exp $
#
do_cleanup() {
@@ -16,6 +16,6 @@ do_test() {
check_result() {
exit_status "0"
- output_require "^Cplain.*:.*Cplain"
- #output_require "^Cplus.*:.*Cplus"
+ output_require "^Cplain"
+ output_require "^Cplus"
}