napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: comment on BUILD_AS_TEST

Browse Source
This commit is contained in:
Adriaan de Groot 2020-11-02 12:01:02 +01:00
parent daaf16d331
commit e66f81f6ee
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeModules/CalamaresAddTest.cmake
View File

@ -42,6 +42,8 @@ function( calamares_add_test )
Qt5::Test Qt5::Test
) )
calamares_automoc( ${TEST_NAME} ) calamares_automoc( ${TEST_NAME} )
# We specifically pass in the source directory of the test-being-
# compiled, so that it can find test-files in that source dir.
target_compile_definitions( ${TEST_NAME} PRIVATE -DBUILD_AS_TEST="${CMAKE_CURRENT_SOURCE_DIR}" ${TEST_DEFINITIONS} ) target_compile_definitions( ${TEST_NAME} PRIVATE -DBUILD_AS_TEST="${CMAKE_CURRENT_SOURCE_DIR}" ${TEST_DEFINITIONS} )
if( TEST_GUI ) if( TEST_GUI )
target_link_libraries( ${TEST_NAME} calamaresui Qt5::Gui ) target_link_libraries( ${TEST_NAME} calamaresui Qt5::Gui )

1
src/modules/users/Tests.cpp
View File

@ -196,6 +196,7 @@ UserTests::testDefaultGroupsYAML()
QFETCH( int, count ); QFETCH( int, count );
QFETCH( QString, group ); QFETCH( QString, group );
// BUILD_AS_TEST is the source-directory path
QFile fi( QString( "%1/%2" ).arg( BUILD_AS_TEST, filename ) ); QFile fi( QString( "%1/%2" ).arg( BUILD_AS_TEST, filename ) );
QVERIFY( fi.exists() ); QVERIFY( fi.exists() );