fa8cffa4c9
We try our best to pass on the file location of a failure, including for
fatal errors, but the reporting or logging machinery should not assume
there is one.
By passing on nullptr for the file location we allow the logging backends
to decide how to handle the situation, e.g. by not emitting extra fields
for failure location.
This effectively reverts c25687fa0b,
in favor of relying on the backends to cope with null filename,
which they already did.
As qFatal uses QMessageLogger, which by default disables file/line
information in release builds, we need to explicitly enable this in
our self-tests, to get uniform test results. Similarly, we disable
file/line info from testlib itself, as reporting Qt internal file
and line information for user diagnostics is less useful. The odd
one out there is qtestdata.cpp, which still ends up in test output
due to using QTEST_ASSERT instead of qFatal for its diagnostics.
Cleaning up that, and unifying how we report testlib issues to the
user, is left for another day.
Pick-to: 6.2
Change-Id: Ib9451b8eed86fe3ade4a4dcaf0037e1a3450321c
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
154 lines
3.4 KiB
CMake
154 lines
3.4 KiB
CMake
# The whole file is written manually.
|
|
# special case skip regeneration
|
|
|
|
include(../../../../src/testlib/selfcover.cmake)
|
|
|
|
# ------------- Test runner -------------
|
|
|
|
qt_internal_add_test(tst_selftests
|
|
OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/"
|
|
EXCEPTIONS
|
|
CATCH
|
|
SOURCES
|
|
tst_selftests.cpp
|
|
catch.cpp
|
|
PUBLIC_LIBRARIES
|
|
Qt::TestPrivate
|
|
# special case begin
|
|
# These lines need to be commented out as they need to be enabled
|
|
# COMPILE_OPTIONS
|
|
# conditionally
|
|
# --cs-exclude-file-abs-wildcard=${QT_SOURCE_TREE}/*
|
|
# --cs-include-file-abs-wildcard=*/src/testlib/*
|
|
# --cs-mcc
|
|
# --cs-mcdc
|
|
# LINK_OPTIONS
|
|
# "$$COVERAGE_OPTIONS"
|
|
# special case end
|
|
)
|
|
|
|
file(GLOB resource_glob_0 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "expected_*")
|
|
foreach(file IN LISTS resource_glob_0)
|
|
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}")
|
|
endforeach()
|
|
|
|
# Resources:
|
|
set(qmake_expected_files_resource_files
|
|
${resource_glob_0}
|
|
)
|
|
|
|
qt_internal_add_resource(tst_selftests "qmake_expected_files"
|
|
PREFIX
|
|
"/"
|
|
BASE
|
|
"${CMAKE_CURRENT_SOURCE_DIR}" # special case
|
|
FILES
|
|
${qmake_expected_files_resource_files}
|
|
)
|
|
|
|
|
|
## Scopes:
|
|
#####################################################################
|
|
|
|
#### Keys ignored in scope 5:.:.:test.pro:NOT ANDROID AND for(file,SUBPROGRAMS):
|
|
# TEST_HELPER_INSTALLS = "../$${file}/$${file}"
|
|
|
|
#### Keys ignored in scope 7:.:..:../selftests.pri:TARGET Qt::Gui:
|
|
# SUBPROGRAMS = "keyboard" "mouse"
|
|
|
|
qt_internal_apply_testlib_coverage_options(tst_selftests)
|
|
|
|
# ------------- Sub tests -------------
|
|
|
|
# special case begin
|
|
set(subprograms
|
|
assert
|
|
badxml
|
|
benchlibcallgrind
|
|
benchlibcounting
|
|
benchlibeventcounter
|
|
benchliboptions
|
|
benchlibtickcounter
|
|
benchlibwalltime
|
|
blacklisted
|
|
cmptest
|
|
commandlinedata
|
|
counting
|
|
crashes
|
|
datatable
|
|
datetime
|
|
deleteLater
|
|
deleteLater_noApp
|
|
differentexec
|
|
exceptionthrow
|
|
expectfail
|
|
failcleanup
|
|
faildatatype
|
|
failfetchtype
|
|
failinit
|
|
failinitdata
|
|
fetchbogus
|
|
findtestdata
|
|
float
|
|
globaldata
|
|
junit
|
|
longstring
|
|
maxwarnings
|
|
multiexec
|
|
pass
|
|
pairdiagnostics
|
|
printdatatags
|
|
printdatatagswithglobaltags
|
|
qexecstringlist
|
|
silent
|
|
signaldumper
|
|
singleskip
|
|
skip
|
|
skipcleanup
|
|
skipinit
|
|
skipinitdata
|
|
sleep
|
|
strcmp
|
|
subtest
|
|
testlib
|
|
tuplediagnostics
|
|
verbose1
|
|
verbose2
|
|
verifyexceptionthrown
|
|
warnings
|
|
watchdog
|
|
)
|
|
|
|
if(TARGET Qt::Gui)
|
|
list(APPEND subprograms
|
|
keyboard
|
|
mouse
|
|
)
|
|
endif()
|
|
|
|
# Ensure uniform location info between release and debug builds
|
|
add_definitions(-DQT_MESSAGELOGCONTEXT)
|
|
|
|
foreach(subprogram IN LISTS subprograms)
|
|
add_subdirectory(${subprogram})
|
|
endforeach()
|
|
|
|
list(JOIN subprograms " " subprograms)
|
|
qt_internal_extend_target(tst_selftests
|
|
DEFINES
|
|
$<$<COMPILE_LANGUAGE:CXX>:SUBPROGRAMS=${subprograms}>
|
|
)
|
|
# special case end
|
|
|
|
#### Keys ignored in scope 1:.:.:test.pro:<TRUE>:
|
|
# CONFIG = "testcase"
|
|
# expected_files.base = "$$PWD/.."
|
|
# expected_files.files = "$$files$$PWD/../expected_*"
|
|
|
|
## Scopes:
|
|
#####################################################################
|
|
|
|
#### Keys ignored in scope 5:.:.:test.pro:NOT ANDROID AND for(file,SUBPROGRAMS):
|
|
# TEST_HELPER_INSTALLS = "../$${file}/$${file}"
|
|
# special case end
|