feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TaskTree test: Simplify subprocess name

Browse Source 
Fix the qbs build.

Amends 63bfeba87f

Change-Id: I271e5059ba8becf4aade8ce21ff9f40201f3734b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Jarek Kobus
2023-11-07 19:17:41 +01:00
parent 1049f8d329
commit 62ad0014f1
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/solutions/qprocesstask/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
add_subdirectory(testsleep) add_subdirectory(testsleep)
add_qtc_test(tst_qprocesstask add_qtc_test(tst_qprocesstask
DEFINES "PROCESS_TESTAPP=\"${CMAKE_CURRENT_BINARY_DIR}/testsleep\"" DEFINES "PROCESS_TESTAPP=\"${CMAKE_CURRENT_BINARY_DIR}/testsleep/testsleep\""
DEPENDS Tasking Qt::Network DEPENDS Tasking Qt::Network
SOURCES tst_qprocesstask.cpp SOURCES tst_qprocesstask.cpp
) )

2
tests/auto/solutions/qprocesstask/qprocesstask.qbs
View File

@@ -15,7 +15,7 @@ Project {
if (qbs.targetOS === "windows") if (qbs.targetOS === "windows")
defines.push("_CRT_SECURE_NO_WARNINGS"); defines.push("_CRT_SECURE_NO_WARNINGS");
defines.push('PROCESS_TESTAPP="' defines.push('PROCESS_TESTAPP="'
+ FileInfo.joinPaths(destinationDirectory, "testsleep") + '"'); + FileInfo.joinPaths(destinationDirectory, "testsleep/testsleep") + '"');
return defines; return defines;
} }
destinationDirectory: project.buildDirectory + '/' destinationDirectory: project.buildDirectory + '/'

3
tests/auto/solutions/qprocesstask/testsleep/testsleep.qbs
View File

@@ -9,4 +9,7 @@ QtApplication {
files: [ files: [
"main.cpp", "main.cpp",
] ]
destinationDirectory: project.buildDirectory + '/'
+ FileInfo.relativePath(project.ide_source_tree, sourceDirectory)
} }

8
tests/auto/solutions/qprocesstask/tst_qprocesstask.cpp
View File

@@ -15,16 +15,10 @@ private slots:
void qProcessTask(); void qProcessTask();
}; };
#ifdef Q_OS_WIN
static const char s_processName[] = "testsleep.exe";
#else
static const char s_processName[] = "testsleep";
#endif
void tst_QProcessTask::qProcessTask() void tst_QProcessTask::qProcessTask()
{ {
const auto setupProcess = [](QProcess &process) { const auto setupProcess = [](QProcess &process) {
process.setProgram(QLatin1String(PROCESS_TESTAPP) + '/' + s_processName); process.setProgram(QLatin1String(PROCESS_TESTAPP));
}; };
{ {