[pkgsrc/trunk]: pkgsrc/regress/compiler regress/compiler: fix regression test

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ccbe7218f870
branches:  trunk
changeset: 331377:ccbe7218f870
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Mar 17 12:20:09 2019 +0000

description:
regress/compiler: fix regression test

diffstat:

 regress/compiler/files/Makefile |  6 ++----
 regress/compiler/spec           |  6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diffs (39 lines):

diff -r 2506431a85e1 -r ccbe7218f870 regress/compiler/files/Makefile
--- a/regress/compiler/files/Makefile   Sun Mar 17 12:01:14 2019 +0000
+++ b/regress/compiler/files/Makefile   Sun Mar 17 12:20:09 2019 +0000
@@ -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 @@
 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 -r 2506431a85e1 -r ccbe7218f870 regress/compiler/spec
--- a/regress/compiler/spec     Sun Mar 17 12:01:14 2019 +0000
+++ b/regress/compiler/spec     Sun Mar 17 12:20:09 2019 +0000
@@ -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 @@
 check_result() {
 
        exit_status "0"
-       output_require "^Cplain.*:.*Cplain"
-       #output_require "^Cplus.*:.*Cplus"
+       output_require "^Cplain"
+       output_require "^Cplus"
 }