Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests build fix for the case when build in source directory

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2020-12-09 03:58:56 +00:00
parent dfc07190dd
commit 15fbd29fb0
10 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/auto/qdbusabstractadaptor/CMakeLists.txt
View file

@ -5,11 +5,11 @@ if(WITH_DBUS AND DBUS_FOUND)
)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
katie_setup_target(qmyserver
katie_setup_target(qdbusabstractadaptor_qmyserver
${CMAKE_CURRENT_SOURCE_DIR}/qmyserver/qmyserver.cpp
${CMAKE_CURRENT_SOURCE_DIR}/myobject.h
)
add_executable(qmyserver ${qmyserver_SOURCES})
add_executable(qdbusabstractadaptor_qmyserver ${qdbusabstractadaptor_qmyserver_SOURCES})
target_link_libraries(qmyserver KtCore KtDBus)
target_link_libraries(qdbusabstractadaptor_qmyserver KtCore KtDBus)
endif()

2
tests/auto/qdbusabstractadaptor/tst_qdbusabstractadaptor.cpp
View file

@ -479,7 +479,7 @@ void tst_QDBusAbstractAdaptor::initTestCase()
// start peer server
QDir workingDirectory = QCoreApplication::applicationDirPath();
QString myserverprogram = workingDirectory.absoluteFilePath(QLatin1String("qmyserver"));
QString myserverprogram = workingDirectory.absoluteFilePath(QLatin1String("qdbusabstractadaptor_qmyserver"));
proc.start(myserverprogram);
QVERIFY(proc.waitForStarted());
QTest::qWait(2000);

6
tests/auto/qdbusabstractinterface/CMakeLists.txt
View file

@ -8,12 +8,12 @@ if(WITH_DBUS AND DBUS_FOUND)
)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
katie_setup_target(qpinger
katie_setup_target(qdbusabstractinterface_qpinger
${CMAKE_CURRENT_SOURCE_DIR}/qpinger/qpinger.cpp
${CMAKE_CURRENT_SOURCE_DIR}/interface.cpp
${CMAKE_CURRENT_SOURCE_DIR}/interface.h
)
add_executable(qpinger ${qpinger_SOURCES})
add_executable(qdbusabstractinterface_qpinger ${qdbusabstractinterface_qpinger_SOURCES})
target_link_libraries(qpinger KtCore KtDBus)
target_link_libraries(qdbusabstractinterface_qpinger KtCore KtDBus)
endif()

2
tests/auto/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
View file

@ -225,7 +225,7 @@ void tst_QDBusAbstractInterface::init()
// start peer server
QDir workingDirectory = QCoreApplication::applicationDirPath();
QString pingerprogram = workingDirectory.absoluteFilePath(QLatin1String("qpinger"));
QString pingerprogram = workingDirectory.absoluteFilePath(QLatin1String("qdbusabstractinterface_qpinger"));
proc.start(pingerprogram);
QVERIFY(proc.waitForStarted());

6
tests/auto/qdbusinterface/CMakeLists.txt
View file

@ -5,11 +5,11 @@ if(WITH_DBUS AND DBUS_FOUND)
)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
katie_setup_target(qmyserver2
katie_setup_target(qdbusinterface_qmyserver
${CMAKE_CURRENT_SOURCE_DIR}/qmyserver/qmyserver.cpp
${CMAKE_CURRENT_SOURCE_DIR}/myobject.h
)
add_executable(qmyserver2 ${qmyserver2_SOURCES})
add_executable(qdbusinterface_qmyserver ${qdbusinterface_qmyserver_SOURCES})
target_link_libraries(qmyserver2 KtCore KtDBus)
target_link_libraries(qdbusinterface_qmyserver KtCore KtDBus)
endif()

2
tests/auto/qdbusinterface/tst_qdbusinterface.cpp
View file

@ -268,7 +268,7 @@ void tst_QDBusInterface::initTestCase()
// start peer server
QDir workingDirectory = QCoreApplication::applicationDirPath();
QString myserverprogram = workingDirectory.absoluteFilePath(QLatin1String("qmyserver2"));
QString myserverprogram = workingDirectory.absoluteFilePath(QLatin1String("qdbusinterface_qmyserver"));
proc.start(myserverprogram);
QVERIFY(proc.waitForStarted());

6
tests/auto/qdbusmarshall/CMakeLists.txt
View file

@ -9,11 +9,11 @@ if(WITH_DBUS AND DBUS_FOUND)
target_link_libraries(tst_qdbusmarshall ${DBUS_LIBRARIES})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
katie_setup_target(qpong
katie_setup_target(qdbusmarshall_qpong
${CMAKE_CURRENT_SOURCE_DIR}/qpong/qpong.cpp
${CMAKE_CURRENT_SOURCE_DIR}/common.h
)
add_executable(qpong ${qpong_SOURCES})
add_executable(qdbusmarshall_qpong ${qdbusmarshall_qpong_SOURCES})
target_link_libraries(qpong KtCore KtDBus)
target_link_libraries(qdbusmarshall_qpong KtCore KtDBus)
endif()

2
tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
View file

@ -128,7 +128,7 @@ void tst_QDBusMarshall::initTestCase()
QDBusConnection con = QDBusConnection::sessionBus();
fileDescriptorPassing = con.connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing;
QDir workingDirectory = QCoreApplication::applicationDirPath();
QString pongprogram = workingDirectory.absoluteFilePath(QLatin1String("qpong"));
QString pongprogram = workingDirectory.absoluteFilePath(QLatin1String("qdbusmarshall_qpong"));
proc.start(pongprogram);
if (!QDBusConnection::sessionBus().interface()->isServiceRegistered(serviceName)) {
QVERIFY(proc.waitForStarted());

4
tests/auto/qlocale/CMakeLists.txt
View file

@ -3,7 +3,7 @@ katie_test(tst_qlocale
)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
add_executable(syslocaleapp
add_executable(qlocale_syslocaleapp
${CMAKE_CURRENT_SOURCE_DIR}/syslocaleapp/syslocaleapp.cpp
)
target_link_libraries(syslocaleapp KtCore)
target_link_libraries(qlocale_syslocaleapp KtCore)

2
tests/auto/qlocale/tst_qlocale.cpp
View file

@ -144,7 +144,7 @@ tst_QLocale::tst_QLocale()
void tst_QLocale::initTestCase()
{
QDir workingDirectory = QCoreApplication::applicationDirPath();
m_sysLocaleApp = workingDirectory.absoluteFilePath(QLatin1String("syslocaleapp"));
m_sysLocaleApp = workingDirectory.absoluteFilePath(QLatin1String("qlocale_syslocaleapp"));
QVERIFY2(QFileInfo(m_sysLocaleApp).exists(),
qPrintable(QString::fromLatin1("SysLocalApp executable '%1' does not exist!")
.arg(QDir::toNativeSeparators(m_sysLocaleApp))));