Received: by mail.netbsd.org (Postfix, from userid 605)
	id E67AC84F1B; Sun, 17 Mar 2019 12:20:10 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 6F4A484D73
	for <pkgsrc-changes@NetBSD.org>; Sun, 17 Mar 2019 12:20:10 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([IPv6:::1])
	by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025)
	with ESMTP id mzjQ5j1HSwQx for <pkgsrc-changes@netbsd.org>;
	Sun, 17 Mar 2019 12:20:10 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id C574184C6C
	for <pkgsrc-changes@NetBSD.org>; Sun, 17 Mar 2019 12:20:09 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id BF738FB16; Sun, 17 Mar 2019 12:20:09 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_15528252099960"
MIME-Version: 1.0
Date: Sun, 17 Mar 2019 12:20:09 +0000
From: "Roland Illig" <rillig@netbsd.org>
Subject: CVS commit: pkgsrc/regress/compiler
To: pkgsrc-changes@NetBSD.org
Reply-To: rillig@netbsd.org
X-Mailer: log_accum
Message-Id: <20190317122009.BF738FB16@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: pkgsrc-changes.NetBSD.org
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_15528252099960
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

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.


--_----------=_15528252099960
Content-Disposition: inline
Content-Length: 1388
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

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.


--_----------=_15528252099960--