1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Use QT_TESTCASE_SOURCEDIR define

Browse Source 
Replace custom SRCDIR define with QT_TESTCASE_SOURCEDIR. The latter is
automatically available to all tests to use and serves the same purpose
but is not terminated by a slash.

Change-Id: I62896d0fd84ac63ac1b74a459ec1646c6bde0a46
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Ievgenii Meshcheriakov 2021-08-10 13:10:04 +02:00
parent 3727683bd5
commit c859b335b9
6 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/gui/text/qcssparser/CMakeLists.txt
View File

@ -14,8 +14,6 @@ list(APPEND test_data "testdata")
qt_internal_add_test(tst_qcssparser qt_internal_add_test(tst_qcssparser
SOURCES SOURCES
tst_qcssparser.cpp tst_qcssparser.cpp
DEFINES
SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\"
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::Gui Qt::Gui
Qt::GuiPrivate Qt::GuiPrivate

2
tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
View File

@ -90,7 +90,7 @@ void tst_QCssParser::scanner_data()
#if defined(Q_OS_ANDROID) #if defined(Q_OS_ANDROID)
QDir d(":/"); QDir d(":/");
#else #else
QDir d(SRCDIR); QDir d(QT_TESTCASE_SOURCEDIR);
#endif #endif
d.cd("testdata"); d.cd("testdata");
d.cd("scanner"); d.cd("scanner");

2
tests/auto/network/access/http2/CMakeLists.txt
View File

@ -8,8 +8,6 @@ qt_internal_add_test(tst_http2
SOURCES SOURCES
http2srv.cpp http2srv.h http2srv.cpp http2srv.h
tst_http2.cpp tst_http2.cpp
DEFINES
SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
Qt::Network Qt::Network

4
tests/auto/network/access/http2/http2srv.cpp
View File

@ -318,11 +318,11 @@ void Http2Server::incomingConnection(qintptr socketDescriptor)
sslSocket->setProtocol(QSsl::TlsV1_2OrLater); sslSocket->setProtocol(QSsl::TlsV1_2OrLater);
connect(sslSocket, SIGNAL(sslErrors(QList<QSslError>)), connect(sslSocket, SIGNAL(sslErrors(QList<QSslError>)),
this, SLOT(ignoreErrorSlot())); this, SLOT(ignoreErrorSlot()));
QFile file(SRCDIR "certs/fluke.key"); QFile file(QT_TESTCASE_SOURCEDIR "/certs/fluke.key");
file.open(QIODevice::ReadOnly); file.open(QIODevice::ReadOnly);
QSslKey key(file.readAll(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey); QSslKey key(file.readAll(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
sslSocket->setPrivateKey(key); sslSocket->setPrivateKey(key);
auto localCert = QSslCertificate::fromPath(SRCDIR "certs/fluke.cert"); auto localCert = QSslCertificate::fromPath(QT_TESTCASE_SOURCEDIR "/certs/fluke.cert");
sslSocket->setLocalCertificateChain(localCert); sslSocket->setLocalCertificateChain(localCert);
sslSocket->setSocketDescriptor(socketDescriptor, QAbstractSocket::ConnectedState); sslSocket->setSocketDescriptor(socketDescriptor, QAbstractSocket::ConnectedState);
// Stop listening. // Stop listening.

2
tests/auto/widgets/dialogs/qfiledialog/CMakeLists.txt
View File

@ -7,8 +7,6 @@
qt_internal_add_test(tst_qfiledialog qt_internal_add_test(tst_qfiledialog
SOURCES SOURCES
tst_qfiledialog.cpp tst_qfiledialog.cpp
DEFINES
SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui

2
tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
View File

@ -303,7 +303,7 @@ void tst_QFiledialog::filesSelectedSignal()
{ {
QFileDialog fd; QFileDialog fd;
fd.setViewMode(QFileDialog::List); fd.setViewMode(QFileDialog::List);
QDir testDir(SRCDIR); QDir testDir(QT_TESTCASE_SOURCEDIR);
fd.setDirectory(testDir); fd.setDirectory(testDir);
QFETCH(QFileDialog::FileMode, fileMode); QFETCH(QFileDialog::FileMode, fileMode);
fd.setFileMode(fileMode); fd.setFileMode(fileMode);