From 5192831bc6f2e4a4d8a42cd09ac6d68de34fd356 Mon Sep 17 00:00:00 2001 From: Mikkel Krautz Date: Thu, 4 Jan 2018 11:19:50 +0100 Subject: src/tests: update .pro files to append to SOURCES and HEADERS instead of overwriting them. Now that test.pri adds source files and headers by default, the .pro files of our tests need to append to SOURCES and HEADERS to ensure everything test.pri adds to SOURCES and HEADERS are kept around. --- src/tests/TestCrypt/TestCrypt.pro | 4 ++-- src/tests/TestCryptographicHash/TestCryptographicHash.pro | 4 ++-- src/tests/TestCryptographicRandom/TestCryptographicRandom.pro | 4 ++-- src/tests/TestFFDHE/TestFFDHE.pro | 4 ++-- src/tests/TestPacketDataStream/TestPacketDataStream.pro | 2 +- src/tests/TestPasswordGenerator/TestPasswordGenerator.pro | 4 ++-- src/tests/TestSSLLocks/TestSSLLocks.pro | 4 ++-- src/tests/TestSelfSignedCertificate/TestSelfSignedCertificate.pro | 4 ++-- src/tests/TestServerAddress/TestServerAddress.pro | 4 ++-- src/tests/TestServerResolver/TestServerResolver.pro | 4 ++-- src/tests/TestStdAbs/TestStdAbs.pro | 2 +- src/tests/TestTimer/TestTimer.pro | 4 ++-- src/tests/TestUnresolvedServerAddress/TestUnresolvedServerAddress.pro | 4 ++-- src/tests/TestXMLTools/TestXMLTools.pro | 4 ++-- 14 files changed, 26 insertions(+), 26 deletions(-) (limited to 'src/tests') diff --git a/src/tests/TestCrypt/TestCrypt.pro b/src/tests/TestCrypt/TestCrypt.pro index 3d9fa5540..2f61dc03d 100644 --- a/src/tests/TestCrypt/TestCrypt.pro +++ b/src/tests/TestCrypt/TestCrypt.pro @@ -8,5 +8,5 @@ include(../test.pri) QT *= network TARGET = TestCrypt -HEADERS = SSL.h SSLLocks.h Timer.h CryptState.h -SOURCES = SSL.cpp SSLLocks.cpp TestCrypt.cpp CryptState.cpp Timer.cpp +HEADERS *= SSL.h SSLLocks.h Timer.h CryptState.h +SOURCES *= SSL.cpp SSLLocks.cpp TestCrypt.cpp CryptState.cpp Timer.cpp diff --git a/src/tests/TestCryptographicHash/TestCryptographicHash.pro b/src/tests/TestCryptographicHash/TestCryptographicHash.pro index fd6e5d7cf..debc78e86 100644 --- a/src/tests/TestCryptographicHash/TestCryptographicHash.pro +++ b/src/tests/TestCryptographicHash/TestCryptographicHash.pro @@ -8,5 +8,5 @@ include(../test.pri) QT += network TARGET = TestCryptographicHash -SOURCES = SSL.cpp SSLLocks.cpp TestCryptographicHash.cpp CryptographicHash.cpp -HEADERS = SSL.h SSLLocks.h CryptographicHash.h +SOURCES *= SSL.cpp SSLLocks.cpp TestCryptographicHash.cpp CryptographicHash.cpp +HEADERS *= SSL.h SSLLocks.h CryptographicHash.h diff --git a/src/tests/TestCryptographicRandom/TestCryptographicRandom.pro b/src/tests/TestCryptographicRandom/TestCryptographicRandom.pro index b38a3818d..5d3edddf1 100644 --- a/src/tests/TestCryptographicRandom/TestCryptographicRandom.pro +++ b/src/tests/TestCryptographicRandom/TestCryptographicRandom.pro @@ -8,8 +8,8 @@ include(../test.pri) QT += network TARGET = TestCryptographicRandom -SOURCES = SSL.cpp SSLLocks.cpp TestCryptographicRandom.cpp CryptographicRandom.cpp arc4random_uniform.cpp -HEADERS = SSL.h SSLLocks.h CryptographicHash.h +SOURCES *= SSL.cpp SSLLocks.cpp TestCryptographicRandom.cpp CryptographicRandom.cpp arc4random_uniform.cpp +HEADERS *= SSL.h SSLLocks.h CryptographicHash.h VPATH *= ../../../3rdparty/arc4random-src INCLUDEPATH *= ../../../3rdparty/arc4random-src diff --git a/src/tests/TestFFDHE/TestFFDHE.pro b/src/tests/TestFFDHE/TestFFDHE.pro index 56d11a4eb..862ec15bf 100644 --- a/src/tests/TestFFDHE/TestFFDHE.pro +++ b/src/tests/TestFFDHE/TestFFDHE.pro @@ -16,5 +16,5 @@ QT += network } TARGET = TestFFDHE -SOURCES = SSL.cpp SSLLocks.cpp FFDHE.cpp TestFFDHE.cpp -HEADERS = SSL.h SSLLocks.h FFDHE.h FFDHETable.h +SOURCES *= SSL.cpp SSLLocks.cpp FFDHE.cpp TestFFDHE.cpp +HEADERS *= SSL.h SSLLocks.h FFDHE.h FFDHETable.h diff --git a/src/tests/TestPacketDataStream/TestPacketDataStream.pro b/src/tests/TestPacketDataStream/TestPacketDataStream.pro index dbbbaa3a3..bc307ec9b 100644 --- a/src/tests/TestPacketDataStream/TestPacketDataStream.pro +++ b/src/tests/TestPacketDataStream/TestPacketDataStream.pro @@ -8,4 +8,4 @@ include(../test.pri) QT *= network TARGET = TestPacketDataStream -SOURCES = TestPacketDataStream.cpp +SOURCES *= TestPacketDataStream.cpp diff --git a/src/tests/TestPasswordGenerator/TestPasswordGenerator.pro b/src/tests/TestPasswordGenerator/TestPasswordGenerator.pro index c08aad494..7a709d48c 100644 --- a/src/tests/TestPasswordGenerator/TestPasswordGenerator.pro +++ b/src/tests/TestPasswordGenerator/TestPasswordGenerator.pro @@ -8,8 +8,8 @@ include(../test.pri) QT += network TARGET = TestPasswordGenerator -SOURCES = SSL.cpp SSLLocks.cpp TestPasswordGenerator.cpp PasswordGenerator.cpp CryptographicRandom.cpp arc4random_uniform.cpp -HEADERS = SSL.h SSLLocks.h PasswordGenerator.h CryptographicHash.h +SOURCES *= SSL.cpp SSLLocks.cpp TestPasswordGenerator.cpp PasswordGenerator.cpp CryptographicRandom.cpp arc4random_uniform.cpp +HEADERS *= SSL.h SSLLocks.h PasswordGenerator.h CryptographicHash.h VPATH *= ../../../3rdparty/arc4random-src INCLUDEPATH *= ../../../3rdparty/arc4random-src diff --git a/src/tests/TestSSLLocks/TestSSLLocks.pro b/src/tests/TestSSLLocks/TestSSLLocks.pro index 1fd3dfdfa..e6be0c5e2 100644 --- a/src/tests/TestSSLLocks/TestSSLLocks.pro +++ b/src/tests/TestSSLLocks/TestSSLLocks.pro @@ -8,5 +8,5 @@ include(../test.pri) QT += network TARGET = TestSSLLocks -SOURCES = SSL.cpp SSLLocks.cpp TestSSLLocks.cpp -HEADERS = SSL.h SSLLocks.h +SOURCES *= SSL.cpp SSLLocks.cpp TestSSLLocks.cpp +HEADERS *= SSL.h SSLLocks.h diff --git a/src/tests/TestSelfSignedCertificate/TestSelfSignedCertificate.pro b/src/tests/TestSelfSignedCertificate/TestSelfSignedCertificate.pro index 7412d15ee..375fecd2b 100644 --- a/src/tests/TestSelfSignedCertificate/TestSelfSignedCertificate.pro +++ b/src/tests/TestSelfSignedCertificate/TestSelfSignedCertificate.pro @@ -9,5 +9,5 @@ include(../../../qmake/qt.pri) QT *= network TARGET = TestSelfSignedCertificate -SOURCES = SSL.cpp SSLLocks.cpp TestSelfSignedCertificate.cpp SelfSignedCertificate.cpp -HEADERS = SSL.h SSLLocks.h SelfSignedCertificate.h +SOURCES *= SSL.cpp SSLLocks.cpp TestSelfSignedCertificate.cpp SelfSignedCertificate.cpp +HEADERS *= SSL.h SSLLocks.h SelfSignedCertificate.h diff --git a/src/tests/TestServerAddress/TestServerAddress.pro b/src/tests/TestServerAddress/TestServerAddress.pro index 738b2594e..e045c1e17 100644 --- a/src/tests/TestServerAddress/TestServerAddress.pro +++ b/src/tests/TestServerAddress/TestServerAddress.pro @@ -8,5 +8,5 @@ include(../test.pri) QT += network TARGET = TestServerAddress -SOURCES = TestServerAddress.cpp ServerAddress.cpp HostAddress.cpp -HEADERS = ServerAddress.h HostAddress.h +SOURCES *= TestServerAddress.cpp ServerAddress.cpp HostAddress.cpp +HEADERS *= ServerAddress.h HostAddress.h diff --git a/src/tests/TestServerResolver/TestServerResolver.pro b/src/tests/TestServerResolver/TestServerResolver.pro index 73f7cbc8a..b0c4c73bb 100644 --- a/src/tests/TestServerResolver/TestServerResolver.pro +++ b/src/tests/TestServerResolver/TestServerResolver.pro @@ -9,8 +9,8 @@ include(../../../qmake/qt.pri) QT *= network TARGET = TestServerResolver -SOURCES = TestServerResolver.cpp HostAddress.cpp ServerResolver_qt5.cpp ServerResolverRecord.cpp -HEADERS = HostAddress.h ServerResolver.h ServerResolverRecord.h +SOURCES *= TestServerResolver.cpp HostAddress.cpp ServerResolver_qt5.cpp ServerResolverRecord.cpp +HEADERS *= HostAddress.h ServerResolver.h ServerResolverRecord.h isEqual(QT_MAJOR_VERSION, 4) { CONFIG *= no-srv diff --git a/src/tests/TestStdAbs/TestStdAbs.pro b/src/tests/TestStdAbs/TestStdAbs.pro index ce3a36107..0164085f2 100644 --- a/src/tests/TestStdAbs/TestStdAbs.pro +++ b/src/tests/TestStdAbs/TestStdAbs.pro @@ -6,4 +6,4 @@ include(../test.pri) TARGET = TestStdAbs -SOURCES = TestStdAbs.cpp +SOURCES *= TestStdAbs.cpp diff --git a/src/tests/TestTimer/TestTimer.pro b/src/tests/TestTimer/TestTimer.pro index 31fa522ee..1318a74ad 100644 --- a/src/tests/TestTimer/TestTimer.pro +++ b/src/tests/TestTimer/TestTimer.pro @@ -6,5 +6,5 @@ include(../test.pri) TARGET = TestTimer -SOURCES = TestTimer.cpp Timer.cpp -HEADERS = Timer.h +SOURCES *= TestTimer.cpp Timer.cpp +HEADERS *= Timer.h diff --git a/src/tests/TestUnresolvedServerAddress/TestUnresolvedServerAddress.pro b/src/tests/TestUnresolvedServerAddress/TestUnresolvedServerAddress.pro index 09d315ae3..c26663abb 100644 --- a/src/tests/TestUnresolvedServerAddress/TestUnresolvedServerAddress.pro +++ b/src/tests/TestUnresolvedServerAddress/TestUnresolvedServerAddress.pro @@ -6,5 +6,5 @@ include(../test.pri) TARGET = TestUnresolvedServerAddress -SOURCES = TestUnresolvedServerAddress.cpp UnresolvedServerAddress.cpp -HEADERS = UnresolvedServerAddress.h +SOURCES *= TestUnresolvedServerAddress.cpp UnresolvedServerAddress.cpp +HEADERS *= UnresolvedServerAddress.h diff --git a/src/tests/TestXMLTools/TestXMLTools.pro b/src/tests/TestXMLTools/TestXMLTools.pro index 6884329d5..53396c666 100644 --- a/src/tests/TestXMLTools/TestXMLTools.pro +++ b/src/tests/TestXMLTools/TestXMLTools.pro @@ -6,5 +6,5 @@ include(../test.pri) TARGET = TestXMLTools -HEADERS = XMLTools.h -SOURCES = TestXMLTools.cpp XMLTools.cpp +HEADERS *= XMLTools.h +SOURCES *= TestXMLTools.cpp XMLTools.cpp -- cgit v1.2.3