pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel/lcov
Module Name: pkgsrc
Committed By: wiz
Date: Mon Oct 5 19:39:02 UTC 2026
Modified Files:
pkgsrc/devel/lcov: Makefile distinfo
Added Files:
pkgsrc/devel/lcov/patches: patch-tests_common.tst
patch-tests_lcov_extract_extract2.sh
Log Message:
lcov: fix some more tests
add test dependency, fix bash shebangs, fix xargs argument, fix
mkdir argument
Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/lcov/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/lcov/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/lcov/patches/patch-tests_common.tst \
pkgsrc/devel/lcov/patches/patch-tests_lcov_extract_extract2.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/lcov/Makefile
diff -u pkgsrc/devel/lcov/Makefile:1.27 pkgsrc/devel/lcov/Makefile:1.28
--- pkgsrc/devel/lcov/Makefile:1.27 Mon Oct 5 18:52:18 2026
+++ pkgsrc/devel/lcov/Makefile Mon Oct 5 19:39:02 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2026/10/05 18:52:18 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2026/10/05 19:39:02 wiz Exp $
DISTNAME= lcov-2.6
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=linux-test-project/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -22,6 +22,7 @@ DEPENDS+= p5-JSON-XS-[0-9]*:../../conver
DEPENDS+= p5-Memory-Process-[0-9]*:../../sysutils/p5-Memory-Process
DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate
DEPENDS+= ${PYPKGPREFIX}-xlsxwriter>=0:../../textproc/py-xlsxwriter
+TEST_DEPENDS+= jq-[0-9]*:../../devel/jq
USE_LANGUAGES= c c++
USE_TOOLS+= bash:run gmake perl
@@ -40,7 +41,7 @@ CONF_FILES= ${PREFIX}/share/examples/lco
${PKG_SYSCONFDIR}/lcovrc
# as of 2.6nb1:
-# 91 tests executed, 72 passed, 19 failed, 0 skipped
+# 91 tests executed, 77 passed, 14 failed, 0 skipped
TEST_TARGET= test
# breaks tests
#TEST_ENV+= TESTCASE_ARGS=--parallel\ ${_MAKE_JOBS_N:U1}
@@ -74,7 +75,6 @@ REPLACE_BASH+= tests/genhtml/mycppfilt.s
REPLACE_BASH+= tests/genhtml/part1.sh
REPLACE_BASH+= tests/genhtml/part2.sh
REPLACE_BASH+= tests/genhtml/relative/relative.sh
-REPLACE_BASH+= tests/genhtml/scriptargs/scriptargs.sh
REPLACE_BASH+= tests/genhtml/selectscript/selectscript.sh
REPLACE_BASH+= tests/genhtml/shellquote/shellquote.sh
REPLACE_BASH+= tests/genhtml/simple/part1.sh
@@ -88,14 +88,12 @@ REPLACE_BASH+= tests/genhtml/xplatform/x
REPLACE_BASH+= tests/genhtml/zero.sh
REPLACE_BASH+= tests/genpng/genpng.sh
REPLACE_BASH+= tests/html2lcov/html2lcov.sh
-REPLACE_BASH+= tests/jacoco2lcov/jacoco2lcov.sh
REPLACE_BASH+= tests/lcov/add/aggdir.sh
REPLACE_BASH+= tests/lcov/add/prune.sh
REPLACE_BASH+= tests/lcov/add/track.sh
REPLACE_BASH+= tests/lcov/branch/branch.sh
REPLACE_BASH+= tests/lcov/coverage/coverage.sh
REPLACE_BASH+= tests/lcov/coverage/geninfo.sh
-REPLACE_BASH+= tests/lcov/demangle/demangle.sh
REPLACE_BASH+= tests/lcov/errs/errs.sh
REPLACE_BASH+= tests/lcov/exception/exception.sh
REPLACE_BASH+= tests/lcov/extract/extract1.sh
@@ -103,7 +101,6 @@ REPLACE_BASH+= tests/lcov/extract/extrac
REPLACE_BASH+= tests/lcov/follow/follow.sh
REPLACE_BASH+= tests/lcov/format/format.sh
REPLACE_BASH+= tests/lcov/gcov-tool/mygcov.sh
-REPLACE_BASH+= tests/lcov/gcov-tool/path.sh
REPLACE_BASH+= tests/lcov/initializer/initializer.sh
REPLACE_BASH+= tests/lcov/lambda/lambda.sh
REPLACE_BASH+= tests/lcov/mcdc/mcdc.sh
@@ -118,7 +115,6 @@ REPLACE_BASH+= tests/lcov/multiple/multi
REPLACE_BASH+= tests/lcov/names/names.sh
REPLACE_BASH+= tests/lcov/parallel_fail/parallel_fail.sh
REPLACE_BASH+= tests/lcov/parallel_parse/parallel_parse.sh
-REPLACE_BASH+= tests/lcov/scheduling/scheduling.sh
REPLACE_BASH+= tests/lcov/serialization/binary.sh
REPLACE_BASH+= tests/lcov/serialization/format.sh
REPLACE_BASH+= tests/lcov/summary/concatenated.sh
@@ -139,7 +135,6 @@ REPLACE_BASH+= tests/lcov/xs_test/xs6.sh
REPLACE_BASH+= tests/lcov/xs_test/xs7.sh
REPLACE_BASH+= tests/llvm2lcov/llvm2lcov.sh
REPLACE_BASH+= tests/llvm2lcov/malformed.sh
-REPLACE_BASH+= tests/perl2lcov/declforms.sh
REPLACE_BASH+= tests/perl2lcov/perltest1.sh
REPLACE_BASH+= tests/py2lcov/py2lcov.sh
REPLACE_BASH+= tests/scripts/analyzeInfoFiles_test.sh
@@ -152,9 +147,21 @@ REPLACE_BASH+= tests/scripts/gitversion_
REPLACE_BASH+= tests/scripts/p4annotate_test.sh
REPLACE_BASH+= tests/scripts/p4udiff_test.sh
REPLACE_BASH+= tests/scripts/p4version_test.sh
-REPLACE_BASH+= tests/winpath/winpath.sh
REPLACE_BASH+= tests/xml2lcov/xml2lcov.sh
+# these scripts are generating other scripts, so more lines need changing
+SUBST_CLASSES+= bh
+SUBST_SED.bh= -e "s,/bin/bash,/usr/pkg/bin/bash,"
+SUBST_FILES.bh+= tests/genhtml/scriptargs/scriptargs.sh
+SUBST_FILES.bh+= tests/jacoco2lcov/jacoco2lcov.sh
+SUBST_FILES.bh+= tests/lcov/demangle/demangle.sh
+SUBST_FILES.bh+= tests/lcov/gcov-tool/path.sh
+SUBST_FILES.bh+= tests/lcov/scheduling/scheduling.sh
+SUBST_FILES.bh+= tests/perl2lcov/declforms.sh
+SUBST_FILES.bh+= tests/winpath/winpath.sh
+SUBST_STAGE.bh= pre-configure
+SUBST_MESSAGE.bh= Fixing path to bash.
+
REPLACE_PERL+= bin/fix.pl
REPLACE_PERL+= bin/gendesc
REPLACE_PERL+= bin/genhtml
@@ -187,7 +194,8 @@ REPLACE_PERL+= tests/genhtml/htmlgen/ann
REPLACE_PERL+= tests/genhtml/insensitive/annotate.pl
REPLACE_PERL+= tests/genhtml/insensitive/version.pl
REPLACE_PERL+= tests/genhtml/lcovrc/annotate.pl
-REPLACE_PERL+= tests/genhtml/selectscript/selectscript.sh
+# not a shebang line, so REPLACE_PERL doesn't work
+#REPLACE_PERL+= tests/genhtml/selectscript/selectscript.sh
REPLACE_PERL+= tests/genhtml/simple/annotate.pl
REPLACE_PERL+= tests/genpng/dumppng.pl
REPLACE_PERL+= tests/lcov/demangle/simplify.pl
@@ -214,6 +222,10 @@ REPLACE_PYTHON+= tests/lcov/scheduling/c
REPLACE_PYTHON+= tests/lcov/scheduling/check_xs_row.py
REPLACE_PYTHON+= tests/py2lcov/test.py
+post-install:
+ ${RM} -f ${DESTDIR}${PREFIX}/share/lcov/tests/common.tst.orig
+ ${RM} -f ${DESTDIR}${PREFIX}/share/lcov/tests/lcov/extract/extract2.sh.orig
+
.include "../../lang/perl5/buildlink3.mk"
.include "../../lang/python/application.mk"
.include "../../lang/python/tool.mk"
Index: pkgsrc/devel/lcov/distinfo
diff -u pkgsrc/devel/lcov/distinfo:1.12 pkgsrc/devel/lcov/distinfo:1.13
--- pkgsrc/devel/lcov/distinfo:1.12 Sun Oct 4 10:06:14 2026
+++ pkgsrc/devel/lcov/distinfo Mon Oct 5 19:39:02 2026
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.12 2026/10/04 10:06:14 wiz Exp $
+$NetBSD: distinfo,v 1.13 2026/10/05 19:39:02 wiz Exp $
BLAKE2s (lcov-2.6.tar.gz) = a2c53724e238994c00e44e8558db49bef0125ea1b5c78938c43c7aa9f15fb299
SHA512 (lcov-2.6.tar.gz) = fa420e9adeffc68e1c9331a705cd055c4c8367d49742b38ea21a23b25f74ff5c71b4873123d9cde63a40988fb2c334690f4fc18aa30dd23e5fb52927d4b52501
Size (lcov-2.6.tar.gz) = 1172595 bytes
SHA1 (patch-lib_LcovUtil_Makefile.PL) = d2c57c45698d72477c33ca735fd4798547baa786
+SHA1 (patch-tests_common.tst) = 9810623c31f2a1fd3c3a2968660c54b54cf1811f
+SHA1 (patch-tests_lcov_extract_extract2.sh) = ff55048f2e1b2c611d823ae160249a085c3af6e6
Added files:
Index: pkgsrc/devel/lcov/patches/patch-tests_common.tst
diff -u /dev/null pkgsrc/devel/lcov/patches/patch-tests_common.tst:1.1
--- /dev/null Mon Oct 5 19:39:02 2026
+++ pkgsrc/devel/lcov/patches/patch-tests_common.tst Mon Oct 5 19:39:02 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-tests_common.tst,v 1.1 2026/10/05 19:39:02 wiz Exp $
+
+Compatibility with NetBSD xargs.
+https://github.com/linux-test-project/lcov/issues/553
+
+--- tests/common.tst.orig 2026-10-05 19:22:58.094159094 +0000
++++ tests/common.tst
+@@ -266,7 +266,7 @@ function check_tla_css()
+ local rc=0
+ local class
+ for class in `find $dir -name '*.html' -print0 |
+- xargs -0 --no-run-if-empty grep -h -o -E 'class="[^"]+"' |
++ xargs -0 -r grep -h -o -E 'class="[^"]+"' |
+ sed -e 's/class="//' -e 's/"$//' | tr ' ' '\n' |
+ grep -E '^tla(Bg)?[A-Z]' | sort -u` ; do
+ if ! grep -E -q "(^|[[:space:]])(td|span|a)\.$class([^A-Za-z0-9]|\$)" \
Index: pkgsrc/devel/lcov/patches/patch-tests_lcov_extract_extract2.sh
diff -u /dev/null pkgsrc/devel/lcov/patches/patch-tests_lcov_extract_extract2.sh:1.1
--- /dev/null Mon Oct 5 19:39:02 2026
+++ pkgsrc/devel/lcov/patches/patch-tests_lcov_extract_extract2.sh Mon Oct 5 19:39:02 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-tests_lcov_extract_extract2.sh,v 1.1 2026/10/05 19:39:02 wiz Exp $
+
+NetBSD's mkdir has no -p.
+https://github.com/linux-test-project/lcov/issues/553
+
+--- tests/lcov/extract/extract2.sh.orig 2026-10-05 19:11:12.392950154 +0000
++++ tests/lcov/extract/extract2.sh
+@@ -761,7 +761,7 @@ rm -rf ./mytest
+
+ # test filename containing spaces
+ rm -rf ./mytest
+-mkdir -pv ./mytest
++mkdir -p ./mytest
+ echo "int main(){}" > './mytest/main space.cpp'
+ ( cd ./mytest ; ${CXX} -c 'main space.cpp' --coverage )
+
Home |
Main Index |
Thread Index |
Old Index