Sorry, forgot the debdiff. Here it is.
diff -Nru onetbb-2021.8.0/debian/changelog onetbb-2021.8.0/debian/changelog --- onetbb-2021.8.0/debian/changelog 2023-05-16 12:23:01.000000000 +0200 +++ onetbb-2021.8.0/debian/changelog 2025-09-28 19:50:00.000000000 +0200 @@ -1,3 +1,11 @@ +onetbb (2021.8.0-2+deb12u1) bookworm; urgency=medium + + * Team upload. + * Skip some tests when the machine has a single CPU. Closes: #1108053. + * Skip test_mutex, it fails in Salsa CI. Closes: #1094260. + + -- Santiago Vila <[email protected]> Sun, 28 Sep 2025 19:50:00 +0200 + onetbb (2021.8.0-2) unstable; urgency=medium * Team upload. diff -Nru onetbb-2021.8.0/debian/patches/series onetbb-2021.8.0/debian/patches/series --- onetbb-2021.8.0/debian/patches/series 2023-05-16 12:23:01.000000000 +0200 +++ onetbb-2021.8.0/debian/patches/series 2025-09-28 19:50:00.000000000 +0200 @@ -4,3 +4,5 @@ 776.diff 0001-Build-tbbmalloc-also-on-mips.patch warning-flags.patch +single-cpu.patch +skip-test-mutex.patch diff -Nru onetbb-2021.8.0/debian/patches/single-cpu.patch onetbb-2021.8.0/debian/patches/single-cpu.patch --- onetbb-2021.8.0/debian/patches/single-cpu.patch 1970-01-01 01:00:00.000000000 +0100 +++ onetbb-2021.8.0/debian/patches/single-cpu.patch 2025-09-28 19:50:00.000000000 +0200 @@ -0,0 +1,32 @@ +Description: Skip some tests when there is only one CPU available +Author: Santiago Vila <[email protected]> +Bug-Debian: https://bugs.debian.org/1108053 +Forwarded: https://github.com/uxlfoundation/oneTBB/issues/1557 +Last-Update: 2025-09-09 + +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -398,8 +398,10 @@ + tbb_add_test(SUBDIR tbb NAME test_concurrent_queue DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR tbb NAME test_resumable_tasks DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR tbb NAME test_mutex DEPENDENCIES TBB::tbb) +- tbb_add_test(SUBDIR tbb NAME test_function_node DEPENDENCIES TBB::tbb) +- tbb_add_test(SUBDIR tbb NAME test_multifunction_node DEPENDENCIES TBB::tbb) ++ if (SYSTEM_CONCURRENCY GREATER 1) ++ tbb_add_test(SUBDIR tbb NAME test_function_node DEPENDENCIES TBB::tbb) ++ tbb_add_test(SUBDIR tbb NAME test_multifunction_node DEPENDENCIES TBB::tbb) ++ endif() + tbb_add_test(SUBDIR tbb NAME test_broadcast_node DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR tbb NAME test_buffer_node DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR tbb NAME test_composite_node DEPENDENCIES TBB::tbb) +@@ -422,7 +424,9 @@ + tbb_add_test(SUBDIR tbb NAME test_tagged_msg DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR tbb NAME test_overwrite_node DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR tbb NAME test_write_once_node DEPENDENCIES TBB::tbb) +- tbb_add_test(SUBDIR tbb NAME test_async_node DEPENDENCIES TBB::tbb) ++ if (SYSTEM_CONCURRENCY GREATER 1) ++ tbb_add_test(SUBDIR tbb NAME test_async_node DEPENDENCIES TBB::tbb) ++ endif() + tbb_add_test(SUBDIR tbb NAME test_input_node DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR tbb NAME test_profiling DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR tbb NAME test_concurrent_queue_whitebox DEPENDENCIES TBB::tbb) diff -Nru onetbb-2021.8.0/debian/patches/skip-test-mutex.patch onetbb-2021.8.0/debian/patches/skip-test-mutex.patch --- onetbb-2021.8.0/debian/patches/skip-test-mutex.patch 1970-01-01 01:00:00.000000000 +0100 +++ onetbb-2021.8.0/debian/patches/skip-test-mutex.patch 2025-09-28 19:50:00.000000000 +0200 @@ -0,0 +1,16 @@ +Description: Skip test_mutex, it fails in Salsa CI +Author: Santiago Vila <[email protected]> +Bug-Debian: https://bugs.debian.org/1094260 +Last-Update: 2025-09-20 + +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -397,7 +397,7 @@ + tbb_add_test(SUBDIR tbb NAME test_enumerable_thread_specific DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR tbb NAME test_concurrent_queue DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR tbb NAME test_resumable_tasks DEPENDENCIES TBB::tbb) +- tbb_add_test(SUBDIR tbb NAME test_mutex DEPENDENCIES TBB::tbb) ++ #tbb_add_test(SUBDIR tbb NAME test_mutex DEPENDENCIES TBB::tbb) + if (SYSTEM_CONCURRENCY GREATER 1) + tbb_add_test(SUBDIR tbb NAME test_function_node DEPENDENCIES TBB::tbb) + tbb_add_test(SUBDIR tbb NAME test_multifunction_node DEPENDENCIES TBB::tbb) diff -Nru onetbb-2021.8.0/debian/salsa-ci.yml onetbb-2021.8.0/debian/salsa-ci.yml --- onetbb-2021.8.0/debian/salsa-ci.yml 2023-05-16 12:23:01.000000000 +0200 +++ onetbb-2021.8.0/debian/salsa-ci.yml 2025-09-28 19:50:00.000000000 +0200 @@ -2,3 +2,6 @@ include: - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + +variables: + SALSA_CI_DISABLE_REPROTEST: 1
