Skip to content

Commit

Permalink
[buteo] Build each test case in own folder. Fixes JB#45205
Browse files Browse the repository at this point in the history
Previously we were randomly failing due to missing UnitTest.o.
Now each unit test folder will compile own UnitTest.o. This way
even if compiling with high -j different unit tests are not competing
of the same resource.
  • Loading branch information
rainemak committed Mar 20, 2019
1 parent abb2dab commit afe6c2d
Show file tree
Hide file tree
Showing 120 changed files with 58 additions and 58 deletions.
1 change: 0 additions & 1 deletion unittests/tests/msyncdtests/AccountsHelperTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../msyncdtestapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/msyncdtests/ClientPluginRunnerTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../msyncdtestapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/msyncdtests/ClientThreadTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../msyncdtestapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/msyncdtests/IPHeartBeatTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../msyncdtestapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/msyncdtests/PluginRunnerTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../msyncdtestapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/msyncdtests/ServerActivatorTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../msyncdtestapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/msyncdtests/ServerPluginRunnerTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../msyncdtestapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/msyncdtests/ServerThreadTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../msyncdtestapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/msyncdtests/StorageBookerTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../msyncdtestapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/msyncdtests/SyncBackupTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../msyncdtestapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/msyncdtests/SyncQueueTest.pro

This file was deleted.

File renamed without changes.
@@ -0,0 +1 @@
include(../msyncdtestapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/msyncdtests/SyncSchedulerTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../msyncdtestapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/msyncdtests/SyncSessionTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../msyncdtestapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/msyncdtests/SyncSigHandlerTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../msyncdtestapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/msyncdtests/SynchronizerTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../msyncdtestapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/msyncdtests/TransportTrackerTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../msyncdtestapplication.pri)
32 changes: 16 additions & 16 deletions unittests/tests/msyncdtests/msyncdtests.pro
@@ -1,24 +1,24 @@
TEMPLATE = subdirs
SUBDIRS = \
AccountsHelperTest.pro \
ClientPluginRunnerTest.pro \
ClientThreadTest.pro \
PluginRunnerTest.pro \
ServerActivatorTest.pro \
ServerPluginRunnerTest.pro \
ServerThreadTest.pro \
StorageBookerTest.pro \
SyncBackupTest.pro \
SyncQueueTest.pro \
SyncSessionTest.pro \
SyncSigHandlerTest.pro \
SynchronizerTest.pro \
TransportTrackerTest.pro \
AccountsHelperTest \
ClientPluginRunnerTest \
ClientThreadTest \
PluginRunnerTest \
ServerActivatorTest \
ServerPluginRunnerTest \
ServerThreadTest \
StorageBookerTest \
SyncBackupTest \
SyncQueueTest \
SyncSessionTest \
SyncSigHandlerTest \
SynchronizerTest \
TransportTrackerTest \

!contains(DEFINES, USE_KEEPALIVE) {
SUBDIRS += \
IPHeartBeatTest.pro \
SyncSchedulerTest.pro \
IPHeartBeatTest \
SyncSchedulerTest \
}

coverage.CONFIG += recursive
Expand Down
1 change: 0 additions & 1 deletion unittests/tests/pluginmanagertests/ClientPluginTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../../testapplication.pri)

This file was deleted.

@@ -0,0 +1 @@
include(../../testapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/pluginmanagertests/ServerPluginTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../../testapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/pluginmanagertests/StoragePluginTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../../testapplication.pri)
8 changes: 4 additions & 4 deletions unittests/tests/pluginmanagertests/pluginmanagertests.pro
@@ -1,9 +1,9 @@
TEMPLATE = subdirs
SUBDIRS = \
ClientPluginTest.pro \
DeletedItemsIdStorageTest.pro \
ServerPluginTest.pro \
StoragePluginTest.pro \
ClientPluginTest \
DeletedItemsIdStorageTest \
ServerPluginTest \
StoragePluginTest \

coverage.CONFIG += recursive
QMAKE_EXTRA_TARGETS += coverage

This file was deleted.

@@ -0,0 +1 @@
include(../syncfwclienttestapplication.pri)
2 changes: 1 addition & 1 deletion unittests/tests/syncfwclienttests/syncfwclienttests.pro
@@ -1,6 +1,6 @@
TEMPLATE = subdirs
SUBDIRS = \
SyncClientInterfaceTest.pro \
SyncClientInterfaceTest \

coverage.CONFIG += recursive
QMAKE_EXTRA_TARGETS += coverage
1 change: 0 additions & 1 deletion unittests/tests/syncprofiletests/ProfileFactoryTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../../testapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/syncprofiletests/ProfileFieldTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../../testapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/syncprofiletests/ProfileManagerTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../../testapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/syncprofiletests/ProfileTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../../testapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/syncprofiletests/StorageProfileTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../../testapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/syncprofiletests/SyncLogTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../../testapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/syncprofiletests/SyncProfileTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../../testapplication.pri)
1 change: 0 additions & 1 deletion unittests/tests/syncprofiletests/SyncScheduleTest.pro

This file was deleted.

@@ -0,0 +1 @@
include(../../testapplication.pri)
16 changes: 8 additions & 8 deletions unittests/tests/syncprofiletests/syncprofiletests.pro
@@ -1,14 +1,14 @@
include(../tests_common.pri)
TEMPLATE = subdirs
SUBDIRS = \
ProfileFactoryTest.pro \
ProfileFieldTest.pro \
ProfileManagerTest.pro \
ProfileTest.pro \
StorageProfileTest.pro \
SyncLogTest.pro \
SyncProfileTest.pro \
SyncScheduleTest.pro \
ProfileFactoryTest \
ProfileFieldTest \
ProfileManagerTest \
ProfileTest \
StorageProfileTest \
SyncLogTest \
SyncProfileTest \
SyncScheduleTest \

testprofiles_client.files = testprofiles/user/client/*
testprofiles_client.path = $${INSTALL_TESTDIR}/syncprofiletests/testprofiles/user/client/
Expand Down

0 comments on commit afe6c2d

Please sign in to comment.