diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-07-07 17:02:05 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-07-15 15:06:54 +0000 |
| commit | bf99c2b62bc3bc2dc10ba8f98bea0496b2026801 (patch) | |
| tree | cad7f59c3b6a7c514e99edee92b3102d4f1406b4 /tests/benchmarks/dbus/qdbusperformance/server | |
| parent | 90d9a86c2e762c9426d0facbd54ed5dbff574ecd (diff) | |
Fix qdbusperformance and qprocess benchmarks
The tests failed because they couldn't find the servers they needed to
run. The dbus server wasn't being built, due to mis-configured CMake
config; fixed dbus server CMake config. Once built, the servers werent
at the paths relative to the test binaries that were given in the test
source files, because the test binary was in the test/ sub-directory.
The dbus test just needed a ../ on its path; the qprocess one also
needed its path wrapped in QFINDTESTDATA(), and a ".exe" suffix on MS.
Pick-to: 6.2 6.1 5.15
Task-number: QTBUG-91713
Change-Id: I5ace23a5815575bbf88ea88e0b16afc7b8ba6a08
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'tests/benchmarks/dbus/qdbusperformance/server')
| -rw-r--r-- | tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt b/tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt index ff4612d042..c3a5ac3c8d 100644 --- a/tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt +++ b/tests/benchmarks/dbus/qdbusperformance/server/CMakeLists.txt @@ -4,9 +4,9 @@ ## server Binary: ##################################################################### -qt_internal_add_benchmark(server +qt_internal_add_executable(server GUI - OUTPUT_DIRECTORY "." + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../serverobject.h server.cpp |