From 8c26f60878cf9411c638cd9fd80767b1b25829de Mon Sep 17 00:00:00 2001 From: Eric Cano <Eric.Cano@cern.ch> Date: Tue, 14 Aug 2018 17:20:56 +0200 Subject: [PATCH] Ensured multi process tests run alone to avoid timeouts. --- tests/parallelTestsMakefile.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/parallelTestsMakefile.in b/tests/parallelTestsMakefile.in index 0cd82fa9a8..28f42e2261 100644 --- a/tests/parallelTestsMakefile.in +++ b/tests/parallelTestsMakefile.in @@ -3,7 +3,7 @@ all: valgrind valgrindMultiprocess helgrindBase helgrindScheduler helgrindOStoreDB helgrindDataTransfer helgrindInMemoryCatalogue helgrindMultiprocess -valgrind: +valgrind: valgrindMultiprocess helgrindMultiprocess valgrind -q @VALGRIND_OPTS_STR@ \ --suppressions=/usr/share/cta-@CTA_VERSION@/unittest/valgrind.suppr \ /usr/bin/cta-unitTests @@ -13,37 +13,37 @@ valgrindMultiprocess: --suppressions=/usr/share/cta-@CTA_VERSION@/unittest/valgrind.suppr \ /usr/bin/cta-unitTests-multiProcess -helgrindBase: +helgrindBase: valgrindMultiprocess helgrindMultiprocess valgrind -q --tool=helgrind @HELGRIND_OPTS_STR@ \ --suppressions=/usr/share/cta-@CTA_VERSION@/unittest/helgrind.suppr \ /usr/bin/cta-unitTests \ --gtest_filter=-OStoreDBPlusMockSchedulerTestVFS*:OStoreTestVFS*:OStoreDBPlusMockSchedulerTestVFS*:InMemory* -helgrindScheduler: +helgrindScheduler: valgrindMultiprocess helgrindMultiprocess valgrind -q --tool=helgrind @HELGRIND_OPTS_STR@ \ --suppressions=/usr/share/cta-@CTA_VERSION@/unittest/helgrind.suppr \ /usr/bin/cta-unitTests \ --gtest_filter=OStoreDBPlusMockSchedulerTestVFS/Scheduler* -helgrindOStoreDB: +helgrindOStoreDB: valgrindMultiprocess helgrindMultiprocess valgrind -q --tool=helgrind @HELGRIND_OPTS_STR@ \ --suppressions=/usr/share/cta-@CTA_VERSION@/unittest/helgrind.suppr \ /usr/bin/cta-unitTests \ --gtest_filter=OStoreTestVFS* -helgrindDataTransfer: +helgrindDataTransfer: valgrindMultiprocess helgrindMultiprocess valgrind -q --tool=helgrind @HELGRIND_OPTS_STR@ \ --suppressions=/usr/share/cta-@CTA_VERSION@/unittest/helgrind.suppr \ /usr/bin/cta-unitTests \ --gtest_filter=OStoreDBPlusMockSchedulerTestVFS/DataTransferSessionTest* -helgrindInMemoryCatalogue: +helgrindInMemoryCatalogue: valgrindMultiprocess helgrindMultiprocess valgrind -q --tool=helgrind @HELGRIND_OPTS_STR@ \ --suppressions=/usr/share/cta-@CTA_VERSION@/unittest/helgrind.suppr \ /usr/bin/cta-unitTests \ --gtest_filter=InMemory/* -helgrindMultiprocess: +helgrindMultiprocess: valgrindMultiprocess valgrind -q --tool=helgrind @HELGRIND_OPTS_STR@ \ --suppressions=/usr/share/cta-@CTA_VERSION@/unittest/helgrind.suppr \ /usr/bin/cta-unitTests-multiProcess \ No newline at end of file -- GitLab