sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #57606 from strk/stop-polluting-filesystem

Browse Source 
Reduce pollution of system directories during test runs
This commit is contained in:
Sandro Santilli 2024-06-21 16:39:19 +02:00 committed by GitHub
commit cfb57fd75a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -19,6 +19,11 @@ endif()
# don't relink it only the shared object changes
set(CMAKE_LINK_DEPENDS_NO_SHARED ON)
# This needs to be set before any add_directory in order to be visible
# by the subdirectories
set(QGIS_TEST_TMP_DIR "${CMAKE_BINARY_DIR}/tmp")
message (STATUS "Ctest Temp Directory set to: ${QGIS_TEST_TMP_DIR}")
#############################################################
# Project and version
set(CPACK_PACKAGE_VERSION_MAJOR "3")

5
cmake/UsePythonTest.cmake
View File

@ -77,6 +77,9 @@ macro(ADD_PYTHON_TEST TESTNAME FILENAME)
set_tests_properties(${TESTNAME} PROPERTIES TIMEOUT ${TEST_TIMEOUT})
endif()
set_tests_properties(${TESTNAME} PROPERTIES FIXTURES_REQUIRED SOURCETREE)
set_tests_properties(${TESTNAME} PROPERTIES
FIXTURES_REQUIRED SOURCETREE
ENVIRONMENT "TMPDIR=${QGIS_TEST_TMP_DIR};QGIS_CUSTOM_CONFIG_PATH=${QGIS_TEST_TMP_DIR}/config"
)
endmacro(ADD_PYTHON_TEST)

2
tests/src/3d/testqgs3drendering.cpp
View File

@ -1752,7 +1752,7 @@ void TestQgs3DRendering::do3DSceneExport( int zoomLevelsCount, int expectedObjec
exporter.setScale( 1.0 );
QVERIFY( exporter.parseVectorLayerEntity( scene->layerEntity( layerPoly ), layerPoly ) );
exporter.save( QString( "test3DSceneExporter-%1" ).arg( zoomLevelsCount ), "/tmp/" );
exporter.save( QString( "test3DSceneExporter-%1" ).arg( zoomLevelsCount ), QDir::tempPath() );
int sum = 0;
for ( auto o : exporter.mObjects )

6
tests/src/CMakeLists.txt
View File

@ -26,7 +26,11 @@ if (ENABLE_TESTS)
set_tests_properties(${TESTNAME} PROPERTIES LABELS ${ARG_QGIS_TEST_LABELS})
endif()
set_tests_properties(${TESTNAME} PROPERTIES FIXTURES_REQUIRED SOURCETREE)
set_tests_properties(${TESTNAME} PROPERTIES
FIXTURES_REQUIRED SOURCETREE
ENVIRONMENT "TMPDIR=${QGIS_TEST_TMP_DIR};QGIS_CUSTOM_CONFIG_PATH=${QGIS_TEST_TMP_DIR}/config"
)
target_compile_definitions(${TESTNAME} PRIVATE "CMAKE_SOURCE_DIR=\"${CMAKE_SOURCE_DIR}\"")
endmacro()

2
tests/src/core/testqgslabelingengine.cpp
View File

@ -4346,7 +4346,7 @@ void TestQgsLabelingEngine::labelingResultsWithCallouts()
job.start();
job.waitForFinished();
job.renderedImage().save( QStringLiteral( "/tmp/renderer.png" ) );
job.renderedImage().save( QString( "%s/renderer.png" ).arg( QDir::tempPath() ) );
std::unique_ptr< QgsLabelingResults > results( job.takeLabelingResults() );
QVERIFY( results );

1
tests/src/core/testqgsproject.cpp
View File

@ -1083,6 +1083,7 @@ void TestQgsProject::testAsynchronousLayerLoading()
int layersCount = layers.count();
project->addMapLayers( layers );
project->writeEntry( QStringLiteral( "Paths" ), QStringLiteral( "Absolute" ), true );
QCOMPARE( project->mapLayers( true ).count(), layersCount - 2 );
QCOMPARE( project->mapLayers( false ).count(), layersCount );