CVS commit: pkgsrc/regress/compiler

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Mar 17 12:20:09 UTC 2019

Modified Files:
        pkgsrc/regress/compiler: spec
        pkgsrc/regress/compiler/files: Makefile

Log Message:
regress/compiler: fix regression test


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/regress/compiler/spec
cvs rdiff -u -r1.1 -r1.2 pkgsrc/regress/compiler/files/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/regress/compiler/spec
diff -u pkgsrc/regress/compiler/spec:1.1 pkgsrc/regress/compiler/spec:1.2
--- pkgsrc/regress/compiler/spec:1.1    Tue Jul 11 05:03:11 2006
+++ pkgsrc/regress/compiler/spec        Sun Mar 17 12:20:09 2019
@@ -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"
 }

Index: pkgsrc/regress/compiler/files/Makefile
diff -u pkgsrc/regress/compiler/files/Makefile:1.1 pkgsrc/regress/compiler/files/Makefile:1.2
--- pkgsrc/regress/compiler/files/Makefile:1.1  Thu Mar  8 14:31:06 2007
+++ pkgsrc/regress/compiler/files/Makefile      Sun Mar 17 12:20:09 2019
@@ -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.