Commit 2fa9c10d authored by Eric Cano's avatar Eric Cano
Browse files

Ensured multi process tests run alone to avoid timeouts.

parent 023c049b
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
all: valgrind valgrindMultiprocess helgrindBase helgrindScheduler helgrindOStoreDB helgrindDataTransfer helgrindInMemoryCatalogue helgrindMultiprocess all: valgrind valgrindMultiprocess helgrindBase helgrindScheduler helgrindOStoreDB helgrindDataTransfer helgrindInMemoryCatalogue helgrindMultiprocess
valgrind: valgrind: valgrindMultiprocess helgrindMultiprocess
valgrind -q @VALGRIND_OPTS_STR@ \ valgrind -q @VALGRIND_OPTS_STR@ \
--suppressions=/usr/share/cta-@CTA_VERSION@/unittest/valgrind.suppr \ --suppressions=/usr/share/cta-@CTA_VERSION@/unittest/valgrind.suppr \
/usr/bin/cta-unitTests /usr/bin/cta-unitTests
...@@ -13,37 +13,37 @@ valgrindMultiprocess: ...@@ -13,37 +13,37 @@ valgrindMultiprocess:
--suppressions=/usr/share/cta-@CTA_VERSION@/unittest/valgrind.suppr \ --suppressions=/usr/share/cta-@CTA_VERSION@/unittest/valgrind.suppr \
/usr/bin/cta-unitTests-multiProcess /usr/bin/cta-unitTests-multiProcess
helgrindBase: helgrindBase: valgrindMultiprocess helgrindMultiprocess
valgrind -q --tool=helgrind @HELGRIND_OPTS_STR@ \ valgrind -q --tool=helgrind @HELGRIND_OPTS_STR@ \
--suppressions=/usr/share/cta-@CTA_VERSION@/unittest/helgrind.suppr \ --suppressions=/usr/share/cta-@CTA_VERSION@/unittest/helgrind.suppr \
/usr/bin/cta-unitTests \ /usr/bin/cta-unitTests \
--gtest_filter=-OStoreDBPlusMockSchedulerTestVFS*:OStoreTestVFS*:OStoreDBPlusMockSchedulerTestVFS*:InMemory* --gtest_filter=-OStoreDBPlusMockSchedulerTestVFS*:OStoreTestVFS*:OStoreDBPlusMockSchedulerTestVFS*:InMemory*
helgrindScheduler: helgrindScheduler: valgrindMultiprocess helgrindMultiprocess
valgrind -q --tool=helgrind @HELGRIND_OPTS_STR@ \ valgrind -q --tool=helgrind @HELGRIND_OPTS_STR@ \
--suppressions=/usr/share/cta-@CTA_VERSION@/unittest/helgrind.suppr \ --suppressions=/usr/share/cta-@CTA_VERSION@/unittest/helgrind.suppr \
/usr/bin/cta-unitTests \ /usr/bin/cta-unitTests \
--gtest_filter=OStoreDBPlusMockSchedulerTestVFS/Scheduler* --gtest_filter=OStoreDBPlusMockSchedulerTestVFS/Scheduler*
helgrindOStoreDB: helgrindOStoreDB: valgrindMultiprocess helgrindMultiprocess
valgrind -q --tool=helgrind @HELGRIND_OPTS_STR@ \ valgrind -q --tool=helgrind @HELGRIND_OPTS_STR@ \
--suppressions=/usr/share/cta-@CTA_VERSION@/unittest/helgrind.suppr \ --suppressions=/usr/share/cta-@CTA_VERSION@/unittest/helgrind.suppr \
/usr/bin/cta-unitTests \ /usr/bin/cta-unitTests \
--gtest_filter=OStoreTestVFS* --gtest_filter=OStoreTestVFS*
helgrindDataTransfer: helgrindDataTransfer: valgrindMultiprocess helgrindMultiprocess
valgrind -q --tool=helgrind @HELGRIND_OPTS_STR@ \ valgrind -q --tool=helgrind @HELGRIND_OPTS_STR@ \
--suppressions=/usr/share/cta-@CTA_VERSION@/unittest/helgrind.suppr \ --suppressions=/usr/share/cta-@CTA_VERSION@/unittest/helgrind.suppr \
/usr/bin/cta-unitTests \ /usr/bin/cta-unitTests \
--gtest_filter=OStoreDBPlusMockSchedulerTestVFS/DataTransferSessionTest* --gtest_filter=OStoreDBPlusMockSchedulerTestVFS/DataTransferSessionTest*
helgrindInMemoryCatalogue: helgrindInMemoryCatalogue: valgrindMultiprocess helgrindMultiprocess
valgrind -q --tool=helgrind @HELGRIND_OPTS_STR@ \ valgrind -q --tool=helgrind @HELGRIND_OPTS_STR@ \
--suppressions=/usr/share/cta-@CTA_VERSION@/unittest/helgrind.suppr \ --suppressions=/usr/share/cta-@CTA_VERSION@/unittest/helgrind.suppr \
/usr/bin/cta-unitTests \ /usr/bin/cta-unitTests \
--gtest_filter=InMemory/* --gtest_filter=InMemory/*
helgrindMultiprocess: helgrindMultiprocess: valgrindMultiprocess
valgrind -q --tool=helgrind @HELGRIND_OPTS_STR@ \ valgrind -q --tool=helgrind @HELGRIND_OPTS_STR@ \
--suppressions=/usr/share/cta-@CTA_VERSION@/unittest/helgrind.suppr \ --suppressions=/usr/share/cta-@CTA_VERSION@/unittest/helgrind.suppr \
/usr/bin/cta-unitTests-multiProcess /usr/bin/cta-unitTests-multiProcess
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment