From 9d70e31c39dd2778a4f69a348c51853a7f489f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20R=C3=B6hling?= Date: Wed, 15 Sep 2021 18:46:39 +0200 Subject: [PATCH] Make tests run in parallel again For some reason, the tests won't run in parallel automatically any more. Gbp-Dch: ignore --- debian/rules | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index eccb45f49..3cbd405af 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,8 @@ export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) BOOTSTRAP_PARALLEL = --parallel=$(NUMJOBS) +else + NUMJOBS = 1 endif BUILD_DATE = $(shell LC_ALL=C date -u "+%B %d, %Y" -d "@$(SOURCE_DATE_EPOCH)") @@ -51,8 +53,8 @@ override_dh_auto_configure: $(BUILD_FLAGS_FILE) override_dh_auto_test: # Pass -j1 to "make test" as a workaround, see https://gitlab.kitware.com/cmake/cmake/issues/17165 - # The tests are still run in parallel as debhelper pass -jX as ARGS to ctest. - dh_auto_test --buildsystem=cmake -- -j1 ARGS="-E CTestTestUpload --timeout 5000" + # The tests are still run in parallel as -jX is passed via ARGS to ctest. + dh_auto_test --buildsystem=cmake -- -j1 ARGS="-E CTestTestUpload --timeout 5000 -j$(NUMJOBS)" execute_after_dh_auto_clean: rm -f $(BUILD_FLAGS_FILE)