fixed tests for mac

Skycoder42 · Skycoder42 · commit ad69e6999ace · 2017-04-07T15:06:08.000+02:00
diff --git a/tests/auto/datasync/CachingDataStoreTest/tst_cachingdatastore.cpp b/tests/auto/datasync/CachingDataStoreTest/tst_cachingdatastore.cpp
@@ -24,7 +24,7 @@ private Q_SLOTS:
 
 void CachingDataStoreTest::initTestCase()
 {
-#ifdef Q_OS_UNIX
+#ifdef Q_OS_LINUX
 	Q_ASSERT(qgetenv("LD_PRELOAD").contains("Qt5DataSync"));
 #endif
 
diff --git a/tests/auto/datasync/ChangeControllerTest/tst_changecontroller.cpp b/tests/auto/datasync/ChangeControllerTest/tst_changecontroller.cpp
@@ -37,7 +37,7 @@ private Q_SLOTS:
 
 void ChangeControllerTest::initTestCase()
 {
-#ifdef Q_OS_UNIX
+#ifdef Q_OS_LINUX
 	Q_ASSERT(qgetenv("LD_PRELOAD").contains("Qt5DataSync"));
 #endif
 
diff --git a/tests/auto/datasync/LocalStoreTest/tst_localstore.cpp b/tests/auto/datasync/LocalStoreTest/tst_localstore.cpp
@@ -34,7 +34,7 @@ private Q_SLOTS:
 
 void LocalStoreTest::initTestCase()
 {
-#ifdef Q_OS_UNIX
+#ifdef Q_OS_LINUX
 	Q_ASSERT(qgetenv("LD_PRELOAD").contains("Qt5DataSync"));
 #endif
 
diff --git a/tests/auto/datasync/SetupTest/tst_setup.cpp b/tests/auto/datasync/SetupTest/tst_setup.cpp
@@ -23,7 +23,7 @@ private Q_SLOTS:
 
 void SetupTest::initTestCase()
 {
-#ifdef Q_OS_UNIX
+#ifdef Q_OS_LINUX
 	Q_ASSERT(qgetenv("LD_PRELOAD").contains("Qt5DataSync"));
 #endif
 
diff --git a/tests/auto/datasync/SqlStateHolderTest/tst_sqlstateholder.cpp b/tests/auto/datasync/SqlStateHolderTest/tst_sqlstateholder.cpp
@@ -25,7 +25,7 @@ private Q_SLOTS:
 
 void SqlStateHolderTest::initTestCase()
 {
-#ifdef Q_OS_UNIX
+#ifdef Q_OS_LINUX
 	Q_ASSERT(qgetenv("LD_PRELOAD").contains("Qt5DataSync"));
 #endif
 
diff --git a/tests/auto/datasync/SqlStoreTest/tst_sqlstore.cpp b/tests/auto/datasync/SqlStoreTest/tst_sqlstore.cpp
@@ -32,7 +32,7 @@ private Q_SLOTS:
 
 void SqlStoreTest::initTestCase()
 {
-#ifdef Q_OS_UNIX
+#ifdef Q_OS_LINUX
 	Q_ASSERT(qgetenv("LD_PRELOAD").contains("Qt5DataSync"));
 #endif
 
diff --git a/tests/auto/datasync/StateHolderTest/tst_stateholder.cpp b/tests/auto/datasync/StateHolderTest/tst_stateholder.cpp
@@ -25,7 +25,7 @@ private Q_SLOTS:
 
 void StateHolderTest::initTestCase()
 {
-#ifdef Q_OS_UNIX
+#ifdef Q_OS_LINUX
 	Q_ASSERT(qgetenv("LD_PRELOAD").contains("Qt5DataSync"));
 #endif
 
diff --git a/tests/auto/datasync/WsRemoteConnectorTest/tst_wsremoteconnector.cpp b/tests/auto/datasync/WsRemoteConnectorTest/tst_wsremoteconnector.cpp
@@ -37,7 +37,7 @@ private Q_SLOTS:
 
 void WsRemoteConnectorTest::initTestCase()
 {
-#ifdef Q_OS_UNIX
+#ifdef Q_OS_LINUX
 	Q_ASSERT(qgetenv("LD_PRELOAD").contains("Qt5DataSync"));
 #endif
 
diff --git a/tests/auto/datasync/tests.pri b/tests/auto/datasync/tests.pri
@@ -17,3 +17,5 @@ SOURCES += \
     $$PWD/mockdatamerger.cpp
 
 INCLUDEPATH += $$PWD
+
+mac: QMAKE_LFLAGS += '-Wl,-rpath,\'$$OUT_PWD/../../../../lib\''

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ private Q_SLOTS:`
`24`	`24`
`25`	`25`	`void CachingDataStoreTest::initTestCase()`
`26`	`26`	`{`
`27`		`-#ifdef Q_OS_UNIX`
	`27`	`+#ifdef Q_OS_LINUX`
`28`	`28`	`Q_ASSERT(qgetenv("LD_PRELOAD").contains("Qt5DataSync"));`
`29`	`29`	`#endif`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ private Q_SLOTS:`
`37`	`37`
`38`	`38`	`void ChangeControllerTest::initTestCase()`
`39`	`39`	`{`
`40`		`-#ifdef Q_OS_UNIX`
	`40`	`+#ifdef Q_OS_LINUX`
`41`	`41`	`Q_ASSERT(qgetenv("LD_PRELOAD").contains("Qt5DataSync"));`
`42`	`42`	`#endif`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ private Q_SLOTS:`
`34`	`34`
`35`	`35`	`void LocalStoreTest::initTestCase()`
`36`	`36`	`{`
`37`		`-#ifdef Q_OS_UNIX`
	`37`	`+#ifdef Q_OS_LINUX`
`38`	`38`	`Q_ASSERT(qgetenv("LD_PRELOAD").contains("Qt5DataSync"));`
`39`	`39`	`#endif`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ private Q_SLOTS:`
`23`	`23`
`24`	`24`	`void SetupTest::initTestCase()`
`25`	`25`	`{`
`26`		`-#ifdef Q_OS_UNIX`
	`26`	`+#ifdef Q_OS_LINUX`
`27`	`27`	`Q_ASSERT(qgetenv("LD_PRELOAD").contains("Qt5DataSync"));`
`28`	`28`	`#endif`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ private Q_SLOTS:`
`25`	`25`
`26`	`26`	`void SqlStateHolderTest::initTestCase()`
`27`	`27`	`{`
`28`		`-#ifdef Q_OS_UNIX`
	`28`	`+#ifdef Q_OS_LINUX`
`29`	`29`	`Q_ASSERT(qgetenv("LD_PRELOAD").contains("Qt5DataSync"));`
`30`	`30`	`#endif`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ private Q_SLOTS:`
`32`	`32`
`33`	`33`	`void SqlStoreTest::initTestCase()`
`34`	`34`	`{`
`35`		`-#ifdef Q_OS_UNIX`
	`35`	`+#ifdef Q_OS_LINUX`
`36`	`36`	`Q_ASSERT(qgetenv("LD_PRELOAD").contains("Qt5DataSync"));`
`37`	`37`	`#endif`
`38`	`38`