From nobody Tue Apr 23 17:37:56 2024
X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VP8Tc2gmxz5HhfK;
Tue, 23 Apr 2024 17:37:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4VP8Tc2C5Cz4JcX;
Tue, 23 Apr 2024 17:37:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1713893876;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=r+/o4/f9RSXnT2MCEDAyCkItlq+0kLe4s3pQ4suGWRI=;
b=Q0W3bjZNiKTk+4tNXpQ/71Jx1Xr6YEJMKMbuiTLagER1DZODSQcsY2ygFbo2NDA6PLCY12
tVNqszhrJzOQ2gNlyRA/+AnOB//R63T1thTO5UTclAUisBnC88MYZGIjQ1duh3vt00B5no
Xfjoqe6PBDDN8HTM7hTrDCV+GX+JMlAOt/Bx2FIzr11coVOrzlc+taPx1bcXbcugtOh3A7
zU5+U1waKkdEZTkVUo7FWpJLh01hMfO185Pc9m7xsC6bI9/SusTyPSvWA2PvNmzcOLMqLU
VQdA52GbEM8DQzECm69qxVzoxV+Z/KB/oSWxxrMfHVNdx3Om96GKECbQuL1x+Q==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713893876; a=rsa-sha256; cv=none;
b=vrqY2hqfRWQtHYxiiyAf+OWlovDR2J/rXMZVvh11C6N86ML+jdkCCVdUu/wQ2JwyCu6T1n
jWZL3RpRB/KvTbywxika1xXJpMPHBOaotrZKypPjK+dNE0hiVyQ0CG04hN3I57Mt5sJgX4
o3tcZ05m/JL4rePfNTctntyRaAMV9smR6pTEgMgvR3BBQe6plXzkBMmTOxt+IPGUeSNzbK
ZK76sLeQWjYh4p5CGkrVBC/nVA4I/0jTlxJwCdKNlgTVTM4Sxzou+/doLzVSARjtsjbT06
Qv8T4wZdBp2pBaWlBXAPaeVGj9ymoVBuISVv/Ea4N6PXA9eHNSnQw1a1dGCRJQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1713893876;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=r+/o4/f9RSXnT2MCEDAyCkItlq+0kLe4s3pQ4suGWRI=;
b=HSwFkNYdoKjMtcIURYNFSRz1vSlAfZSE01KenxhooQuq8r2n+Mv882RzBSuNWNb6obPEae
MLIimWHi17IsDFSQpUnIAo6pfPtezs50al3/r7X2uLPK5FZaF8qkxg/xoD+5rvWLI7jQVx
Av7/EhEd6GM5OLh5jPxu+yHPMfla/NOX8u2mY2XzAYg+wPk3pPgOO171pVSKdzBcsZdhm0
x7yYY1LL/8Z/r8nhKIOARsGZBZi7XuxXIioUhHRzcAMbvWJLy85Je7r8oBSb4sgcojgaS6
WQPdwwsU3Bawa4ulVMaimeyhrh35aX8vGnafl+1dPxPx4KejJA4xBzRoHD7kXw==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VP8Tc1qQGzgnj;
Tue, 23 Apr 2024 17:37:56 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NHbui7057306;
Tue, 23 Apr 2024 17:37:56 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NHbu9r057303;
Tue, 23 Apr 2024 17:37:56 GMT
(envelope-from git)
Date: Tue, 23 Apr 2024 17:37:56 GMT
Message-Id: <202404231737.43NHbu9r057303@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Matthias Andree <mandree@FreeBSD.org>
Subject: git: 160df1b4d171 - main - textproc/source-highlight: fix
"make test" or -DWITH_TESTING build
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-ports-main@freebsd.org
Sender: owner-dev-commits-ports-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mandree
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 160df1b4d1717d272b35802b665c7593869a1ebd
Auto-Submitted: auto-generated
The branch main has been updated by mandree:
URL: https://cgit.FreeBSD.org/ports/commit/?id=160df1b4d1717d272b35802b665c7593869a1ebd
commit 160df1b4d1717d272b35802b665c7593869a1ebd
Author: Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2024-04-23 17:31:41 +0000
Commit: Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2024-04-23 17:35:33 +0000
textproc/source-highlight: fix "make test" or -DWITH_TESTING build
The normal build works for me, but "make test",
or poudriere-devel builds on FreeBSD 14.0-RELEASE amd64 under
WITH_TESTING=yes, fail for me in the test phase.
Fix two compiler bugs that LLVM/clang asserts:
* lib/tests/stdboosterror.h poses a most vexing parse,
resolve by switching to C++11 uniform initialization
(GCC 12 or 13 disambiguates by resolving to variable init.)
* lib/tests/test_wordtokenizer_main.cpp sees LLVM/clang complain
about unresolved operator<< (needs to be defined earlier,
so move the declaration up) (couldn't test with GCC)
Serialize tests/Makefile:
* tests/Makefile* causes "No such file or directory" errors when
running with MAKE_JOBS, so patch a .NOTPARALLEL into the Makefile.
Approved by: portmgr@ (blanket just-fix-it approval for failing build)
---
.../files/patch-lib_tests_stdboosterror.h | 11 +++++++++++
.../patch-lib_tests_test__wordtokenizer__main.cpp | 22 ++++++++++++++++++++++
.../source-highlight/files/patch-tests_Makefile.in | 13 +++++++++++--
3 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/textproc/source-highlight/files/patch-lib_tests_stdboosterror.h b/textproc/source-highlight/files/patch-lib_tests_stdboosterror.h
new file mode 100644
index 000000000000..d6c52e70e63e
--- /dev/null
+++ b/textproc/source-highlight/files/patch-lib_tests_stdboosterror.h
@@ -0,0 +1,11 @@
+--- lib/tests/stdboosterror.h.orig 2019-06-02 15:22:17 UTC
++++ lib/tests/stdboosterror.h
+@@ -4,7 +4,7 @@ static boost::regex_error
+ #include <boost/regex/pattern_except.hpp>
+
+ static boost::regex_error
+- std_boost_exception(boost::regex_error(boost::regex_constants::error_bad_pattern));
++ std_boost_exception{boost::regex_error(boost::regex_constants::error_bad_pattern)};
+
+ /**
+ * returns the string representing a standard exception (which
diff --git a/textproc/source-highlight/files/patch-lib_tests_test__wordtokenizer__main.cpp b/textproc/source-highlight/files/patch-lib_tests_test__wordtokenizer__main.cpp
new file mode 100644
index 000000000000..f56001ece7a2
--- /dev/null
+++ b/textproc/source-highlight/files/patch-lib_tests_test__wordtokenizer__main.cpp
@@ -0,0 +1,22 @@
+--- lib/tests/test_wordtokenizer_main.cpp.orig 2018-10-09 17:21:21 UTC
++++ lib/tests/test_wordtokenizer_main.cpp
+@@ -3,15 +3,16 @@
+ #endif
+
+ #include <iostream>
+-
+-#include "asserttestexit.h"
+ #include "srchilite/wordtokenizer.h"
+-#include "srchilite/tostringcollection.h"
+
+ using namespace std;
+ using namespace srchilite;
+
+ static ostream &operator <<(ostream &os, const WordTokenizer::WordTokenizerResults::value_type &);
++
++#include "asserttestexit.h"
++#include "srchilite/tostringcollection.h"
++
+
+ ostream &operator <<(ostream &os, const WordTokenizer::WordTokenizerResults::value_type &token) {
+ if (token.first.size()) {
diff --git a/textproc/source-highlight/files/patch-tests_Makefile.in b/textproc/source-highlight/files/patch-tests_Makefile.in
index 956ceeb09c5b..f798822f22bb 100644
--- a/textproc/source-highlight/files/patch-tests_Makefile.in
+++ b/textproc/source-highlight/files/patch-tests_Makefile.in
@@ -1,6 +1,15 @@
---- tests/Makefile.in.orig 2016-08-25 16:54:10 UTC
+--- tests/Makefile.in.orig 2024-04-23 17:29:34 UTC
+++ tests/Makefile.in
-@@ -2108,7 +2108,7 @@ check_defaults:
+@@ -14,6 +14,8 @@
+
+ @SET_MAKE@
+
++.NOTPARALLEL: # some of the java-related tests can't run in parallel
++
+ # Copyright (C) 1999-2008 Lorenzo Bettini <http://www.lorenzobettini.it>
+ #
+ # This file is free software; as a special exception the author gives
+@@ -2240,7 +2242,7 @@ check_defaults:
@NO_CTAGS_FALSE@ sed -itesttmp -e 's/\_tmp\.h/\.h/g' test_refs_tmp.h.html test_refs_tmp.cpp.html
@NO_CTAGS_FALSE@ sed -itesttmp -e 's/\_tmp\.cpp/\.cpp/g' test_refs_tmp.h.html test_refs_tmp.cpp.html
@NO_CTAGS_FALSE@ $(CPP2LATEX_WREFS) -i $(srcdir)/test.h -o test_ref.out.tex $(CTAGS_COMMAND_TMP)