From 3e42d1577189af123b773dc0f11e5419035308c8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 26 Apr 2024 23:59:37 +0100 Subject: gentoo auto-resync : 26:04:2024 - 23:59:36 --- dev-util/gcovr/Manifest | 2 +- dev-util/gcovr/gcovr-7.2.ebuild | 69 +++++++++++++++++++++++++++++++++++------ 2 files changed, 60 insertions(+), 11 deletions(-) (limited to 'dev-util/gcovr') diff --git a/dev-util/gcovr/Manifest b/dev-util/gcovr/Manifest index 7907f7f61b2b..e887d91d4d5d 100644 --- a/dev-util/gcovr/Manifest +++ b/dev-util/gcovr/Manifest @@ -5,5 +5,5 @@ DIST gcovr-7.2.gh.tar.gz 2800014 BLAKE2B e334688f129868d9affe0fa5c5280eb7dd4c578 EBUILD gcovr-5.1.ebuild 1010 BLAKE2B 5ab8716f554c9d28731df15f064bf96f6184dfba6f58da14c1fdfb7e98c61d7809085e790c98e65b078716304bb3ec660385b929726123fe7aa993d1dfa2fad7 SHA512 a0e57036967b5b3256c2a77792dbe92c8c5f1a2c1f5258131f2c279bcef6a780be385d3942d3ae95a2f723844099187e4b44b627cd5399ae828fc8d43f02ae3d EBUILD gcovr-5.2.ebuild 1056 BLAKE2B 71f8295c2334e921391bb5ec57cfbbaff2f5e8c17f1efce79c308d1ea2e4d85ac740dd243bfa5762b26f7ccec66a01948a60011744dc08bc15cc806dcc247139 SHA512 f88ee9df9e9ae5b448915791aaca18cfb0d3c23e86073922260897080c4dcb27d5634392b61fee0c3f9144d5de2dd6072b6e7f9d0cc11a4825590cf84d188a01 EBUILD gcovr-6.0.ebuild 975 BLAKE2B 1d7c2fedfdbfa0757f009cf588e68068e9400693d19327af86af41097d490b8e06659782673f8cc2bf6c96d10bd3b497dfbfccc5327a5a40152d142ed8bd3568 SHA512 1cb95bdad3671f38aa06aa3a1a40fdd3542fb01f149df1c9da7bd52a1163f963e6ba05f3b84d91fe50d172f571629e8947819d954e9913ed74aab23001a83630 -EBUILD gcovr-7.2.ebuild 6486 BLAKE2B 2d3a36743769d03fa57d0b433207d17404eea32495d93b625511743764635d1510bc135e276b88e49e2fc071d0c0cbf6099549e07641993dc89815e84a999324 SHA512 03f1bc38ed7ff3fa8f077fa4ad5ab651e61bf45dae248ca78e7ec4a8d71eae185e3d3039183ad38d4de80ee93930a302b6a29c8dc59cb8d02c1fdedfa76fb10e +EBUILD gcovr-7.2.ebuild 7842 BLAKE2B 5f1bb079ec661a17804aaf602f81117d27456d803b0236e8798aa7c902e64c54b4c1e939b11fd3dabcaa1a2f88bb2dc45c0bdaea7e711903a317d493e372bc09 SHA512 c5cb483fb245ba94e854fe6c4decae86e68fd78f2bad8a80d1f2b2e29b674188cd43475ed4097754a8ed548841ce6dc72b8d46e1ff9f19b41e4932aec785ae07 MISC metadata.xml 326 BLAKE2B 0ff392fe3a804fc6d8ea83de983357676a8155dee2fbb5204baf0ead2800210ea30a0171398c71dc60b1d9423a6fd65c0a9032d4511caa459c9b4d4f70ee4132 SHA512 5f5a49bfbbd3d3b77314f7de0c5981a3e700b42733d1c4f6868a7c25d12bb6227ebd254925cbbb6a5d73bf8a0b9f99115d396009d55797e39b53dc43a1a79107 diff --git a/dev-util/gcovr/gcovr-7.2.ebuild b/dev-util/gcovr/gcovr-7.2.ebuild index aa226b32ebe5..cf3116b1bdaf 100644 --- a/dev-util/gcovr/gcovr-7.2.ebuild +++ b/dev-util/gcovr/gcovr-7.2.ebuild @@ -185,6 +185,65 @@ python_test() { "wspace-html" ) + local cc cc_ver + cc="$(tc-get-compiler-type)" + case "${cc}" in + gcc) + cc_ver="$(gcc-major-version)" + + # a bunch of tests are broken on gcc-14 + # https://bugs.gentoo.org/930680 + if [[ $(gcc-major-version) -ge 14 ]]; then + test_build_deselect+=( + "calls-json" + "decisions-neg-delta-json" + "different-function-lines-separate-lcov" + "different-function-lines-use-0-lcov" + "different-function-lines-use-max-lcov" + "different-function-lines-use-min-lcov" + "dot-lcov" + "excl-branch-lcov" + "excl-line-json" + "excl-line-lcov" + "excl-line-branch-lcov" + "excl-line-custom-lcov" + "exclude-directories-relative-lcov" + "exclude-lines-by-pattern-lcov" + "exclude-relative-lcov" + "exclude-relative-from-unfiltered-tracefile-lcov" + "filter-absolute-lcov" + "filter-absolute-from-unfiltered-tracefile-lcov" + "filter-relative-lcov" + "filter-relative-from-unfiltered-tracefile-lcov" + "filter-relative-lib-lcov" + "filter-relative-lib-from-unfiltered-tracefile-lcov" + "linked-lcov" + "nested-lcov" + "nested2-lcov" + "nested3-lcov" + "no-markers-json" + "no-markers-lcov" + "noncode-json" + "noncode-lcov" + "oos-lcov" + "oos2-lcov" + "shadow-json" + "simple1-txt" + "simple1-json" + "simple1-dir-json" + "simple1-stdout-json" + "simple1-stdout-lcov" + "threaded-lcov" + "update-data-lcov" + "wspace-lcov" + ) + fi + ;; + clang) cc_ver="$(clang-major-version)";; + # placeholder since tests need CC_REFERENCE to be string-number + *) cc_ver=1;; + esac + readarray -t EPYTEST_DESELECT < <(printf 'gcovr/tests/test_gcovr.py::test_build[%s]\n' "${test_build_deselect[@]}") EPYTEST_DESELECT+=( @@ -193,16 +252,6 @@ python_test() { gcovr/tests/test_args.py::test_multiple_output_formats_to_stdout gcovr/tests/test_args.py::test_multiple_output_formats_to_stdout_1 ) - - local cc cc_ver - cc="$(tc-get-compiler-type)" - case "${cc}" in - gcc) cc_ver="$(gcc-major-version)";; - clang) cc_ver="$(clang-major-version)";; - # placeholder since tests need CC_REFERENCE to be string-number - *) cc_ver=1 - esac - local -x CC_REFERENCE="${cc}-${cc_ver}" epytest gcovr -- cgit v1.2.3