diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2024-04-23 19:31:41 +0200 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2024-04-23 19:35:33 +0200 |
| commit | 160df1b4d1717d272b35802b665c7593869a1ebd (patch) | |
| tree | 16254515e2027fbb2d717b75bb54e46dd5af6afc /textproc/source-highlight/files/patch-tests_Makefile.in | |
| parent | news/suck: fix build (diff) | |
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)
Diffstat (limited to 'textproc/source-highlight/files/patch-tests_Makefile.in')
| -rw-r--r-- | textproc/source-highlight/files/patch-tests_Makefile.in | 13 |
1 files changed, 11 insertions, 2 deletions
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) |