Bug#1116575: trixie-pu: package onetbb/2022.1.0-1+deb13u1
Sorry, forgot the debdiff, here it is.
diff -Nru onetbb-2022.1.0/debian/changelog onetbb-2022.1.0/debian/changelog
--- onetbb-2022.1.0/debian/changelog 2025-04-02 20:52:06.000000000 +0200
+++ onetbb-2022.1.0/debian/changelog 2025-09-28 18:50:00.000000000 +0200
@@ -1,3 +1,11 @@
+onetbb (2022.1.0-1+deb13u1) trixie; 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 <sanvila@debian.org> Sun, 28 Sep 2025 18:50:00 +0200
+
onetbb (2022.1.0-1) unstable; urgency=medium
* Team upload (Closes: #1101729)
diff -Nru onetbb-2022.1.0/debian/patches/series onetbb-2022.1.0/debian/patches/series
--- onetbb-2022.1.0/debian/patches/series 2025-04-02 20:52:06.000000000 +0200
+++ onetbb-2022.1.0/debian/patches/series 2025-09-28 18:50:00.000000000 +0200
@@ -7,3 +7,5 @@
sh4-support.patch
sphinx-change-theme-to-avoid-ftbfs.patch
skip-resumable-tasks.patch
+single-cpu.patch
+skip-test-mutex.patch
diff -Nru onetbb-2022.1.0/debian/patches/single-cpu.patch onetbb-2022.1.0/debian/patches/single-cpu.patch
--- onetbb-2022.1.0/debian/patches/single-cpu.patch 1970-01-01 01:00:00.000000000 +0100
+++ onetbb-2022.1.0/debian/patches/single-cpu.patch 2025-09-28 18:50:00.000000000 +0200
@@ -0,0 +1,32 @@
+Description: Skip some tests when there is only one CPU available
+Author: Santiago Vila <sanvila@debian.org>
+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
+@@ -447,8 +447,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)
+@@ -472,7 +474,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-2022.1.0/debian/patches/skip-test-mutex.patch onetbb-2022.1.0/debian/patches/skip-test-mutex.patch
--- onetbb-2022.1.0/debian/patches/skip-test-mutex.patch 1970-01-01 01:00:00.000000000 +0100
+++ onetbb-2022.1.0/debian/patches/skip-test-mutex.patch 2025-09-28 18:50:00.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Skip test_mutex, it fails in Salsa CI
+Author: Santiago Vila <sanvila@debian.org>
+Bug-Debian: https://bugs.debian.org/1094260
+Last-Update: 2025-09-20
+
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -446,7 +446,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-2022.1.0/debian/salsa-ci.yml onetbb-2022.1.0/debian/salsa-ci.yml
--- onetbb-2022.1.0/debian/salsa-ci.yml 1970-01-01 01:00:00.000000000 +0100
+++ onetbb-2022.1.0/debian/salsa-ci.yml 2025-09-28 18:50:00.000000000 +0200
@@ -0,0 +1,6 @@
+---
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
+
+variables:
+ SALSA_CI_DISABLE_REPROTEST: 1
Reply to: