From 4632fdae9d98c749bd8dbc1328723fc1dd7dda43 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Sun, 24 Nov 2024 07:22:07 +0100 Subject: [PATCH 1/5] test --- application/testing/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt index 811d8b72a9..363279612a 100644 --- a/application/testing/CMakeLists.txt +++ b/application/testing/CMakeLists.txt @@ -64,7 +64,7 @@ function(f3d_test) add_test(NAME "f3d::${F3D_TEST_NAME}" COMMAND $ ${F3D_TEST_ARGS} COMMAND_EXPAND_LISTS) set(_timeout "30") - if(F3D_TEST_LONG_TIMEOUT OR F3D_TEST_INTERACTION) + if(F3D_TEST_LONG_TIMEOUT) set(_timeout "120") endif() @@ -92,7 +92,7 @@ function(f3d_test) endif() endif() if(NOT F3D_TESTING_ENABLE_LONG_TIMEOUT_TESTS) - if(F3D_TEST_LONG_TIMEOUT OR F3D_TEST_INTERACTION) + if(F3D_TEST_LONG_TIMEOUT) set_tests_properties(f3d::${F3D_TEST_NAME} PROPERTIES DISABLED ON) endif() endif() From 33a153197b5ace98431ab3726361594ee2d36419 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Sun, 24 Nov 2024 07:44:40 +0100 Subject: [PATCH 2/5] more --- application/testing/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt index 363279612a..9e516b0a6b 100644 --- a/application/testing/CMakeLists.txt +++ b/application/testing/CMakeLists.txt @@ -93,7 +93,7 @@ function(f3d_test) endif() if(NOT F3D_TESTING_ENABLE_LONG_TIMEOUT_TESTS) if(F3D_TEST_LONG_TIMEOUT) - set_tests_properties(f3d::${F3D_TEST_NAME} PROPERTIES DISABLED ON) +# set_tests_properties(f3d::${F3D_TEST_NAME} PROPERTIES DISABLED ON) endif() endif() set_tests_properties(f3d::${F3D_TEST_NAME} PROPERTIES TIMEOUT ${_timeout}) From 87c3473400c02cb46d97c6e0be37884f9fab7dd8 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Mon, 25 Nov 2024 08:13:37 +0100 Subject: [PATCH 3/5] Update tests and CI for new long timeout logic --- .github/actions/generic-ci/action.yml | 8 +++--- application/testing/CMakeLists.txt | 38 +++++++++++++-------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.github/actions/generic-ci/action.yml b/.github/actions/generic-ci/action.yml index 26aec9bea1..0fd0c7849e 100644 --- a/.github/actions/generic-ci/action.yml +++ b/.github/actions/generic-ci/action.yml @@ -170,12 +170,12 @@ runs: -DF3D_TESTING_ENABLE_EXTERNAL_GLFW=${{ (runner.os == 'Linux' && inputs.rendering_backend == 'auto') && 'ON' || 'OFF' }} -DF3D_TESTING_ENABLE_EXTERNAL_QT=${{ (runner.os == 'Linux' && inputs.rendering_backend == 'auto') && 'ON' || 'OFF' }} -DF3D_TESTING_ENABLE_GLX_TESTS=${{ (runner.os == 'Linux' && inputs.rendering_backend == 'auto') && 'ON' || 'OFF' }} + -DF3D_TESTING_ENABLE_LONG_TIMEOUT_TESTS=${{ (runner.os != 'macOS' || inputs.cpu == 'x86_64') && 'OFF' || 'ON' }} -DF3D_TESTING_ENABLE_OSMESA_TESTS=${{ runner.os == 'Linux' && 'ON' || 'OFF' }} -DF3D_TESTING_FORCE_RENDERING_BACKEND=${{ inputs.rendering_backend }} -DF3D_WINDOWS_GUI=ON ${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }} ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }} - ${{ runner.os == 'Linux' && '-DF3D_TESTING_ENABLE_LONG_TIMEOUT_TESTS=ON' || null }} - name: Build shell: bash @@ -205,22 +205,24 @@ runs: # Certain tests are failing on macOS with GPU pass through # https://github.com/f3d-app/f3d/issues/792 + # https://github.com/f3d-app/f3d/issues/1534 - name: Set CI test exception for macOS x86_64 if: | runner.os == 'macOS' && inputs.cpu == 'x86_64' shell: bash - run: echo "F3D_CTEST_EXCEPTIONS=(TestDXF)|(TestScalarsCell)|(TestXCAFColors)" >> $GITHUB_ENV + run: echo "F3D_CTEST_EXCEPTIONS=(TestDXF)|(TestScalarsCell)|(TestXCAFColors)|(TestInteractionAnimationSlow)|(TestInteractionFocalPointPickingPoints)|(TestInteractionCycleAnimation)" >> $GITHUB_ENV # Certain tests are failing on macOS arm64 for unknown reasons # https://github.com/f3d-app/f3d/issues/1276 # https://github.com/f3d-app/f3d/issues/792 + # https://github.com/f3d-app/f3d/issues/1534 - name: Set CI test exception for macOS arm64 if: | runner.os == 'macOS' && inputs.cpu == 'arm64' shell: bash - run: echo "F3D_CTEST_EXCEPTIONS=(TestDepthPeelingToneMapping)|(TestDepthPeeling)|(TestTextureColor)|(TestDXF)|(TestScalarsCell)|(TestXCAFColors)|(TestGrid)|(TestConfig)|(TestGLTFDracoImporter)|(TestSDKInteractorCallBack)" >> $GITHUB_ENV + run: echo "F3D_CTEST_EXCEPTIONS=(TestDepthPeelingToneMapping)|(TestDepthPeeling)|(TestTextureColor)|(TestDXF)|(TestScalarsCell)|(TestXCAFColors)|(TestGrid)|(TestConfig)|(TestGLTFDracoImporter)|(TestSDKInteractorCallBack)|(TestInteractionActors)|(TestDefaultConfigFile.*)|(TestThumbnailConfigFile.*)|(TestInteractionCycleAnimation)|(TestInteractionCycleAnimation)|(TestInteractionAnimationSlow)" >> $GITHUB_ENV - name: Test shell: bash diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt index 9e516b0a6b..d009244f5e 100644 --- a/application/testing/CMakeLists.txt +++ b/application/testing/CMakeLists.txt @@ -93,7 +93,7 @@ function(f3d_test) endif() if(NOT F3D_TESTING_ENABLE_LONG_TIMEOUT_TESTS) if(F3D_TEST_LONG_TIMEOUT) -# set_tests_properties(f3d::${F3D_TEST_NAME} PROPERTIES DISABLED ON) + set_tests_properties(f3d::${F3D_TEST_NAME} PROPERTIES DISABLED ON) endif() endif() set_tests_properties(f3d::${F3D_TEST_NAME} PROPERTIES TIMEOUT ${_timeout}) @@ -166,7 +166,7 @@ f3d_test(NAME TestGLTFSkin DATA SimpleSkin.gltf) f3d_test(NAME TestDicom DATA IM-0001-1983.dcm ARGS --scalar-coloring --roughness=1) f3d_test(NAME TestMHD DATA HeadMRVolume.mhd ARGS --scalar-coloring --roughness=1) f3d_test(NAME TestVTICell DATA waveletMaterial.vti ARGS -s --coloring-array=Material -c --roughness=1) -f3d_test(NAME TestSSAO LONG_TIMEOUT DATA suzanne.ply ARGS -q) +f3d_test(NAME TestSSAO DATA suzanne.ply ARGS -q) f3d_test(NAME TestDepthPeeling DATA suzanne.ply ARGS -sp --opacity=0.9) f3d_test(NAME TestBackground DATA suzanne.ply ARGS --bg-color=0.8,0.2,0.9 THRESHOLD 0.1) # Threshold is needed for legacy image comparison for VTK 9.3 f3d_test(NAME TestGridWithDepthPeeling DATA suzanne.ply ARGS -gp --opacity=0.2) @@ -181,12 +181,12 @@ f3d_test(NAME TestCameraClipping DATA checkerboard_colorful.obj CONFIG ${F3D_SOU f3d_test(NAME TestCameraOrthographic ARGS --camera-orthographic DATA cow.vtp) f3d_test(NAME TestToneMapping DATA suzanne.ply ARGS -t TONE_MAPPING) f3d_test(NAME TestDepthPeelingToneMapping DATA suzanne.ply ARGS --opacity=0.9 -pt TONE_MAPPING) -f3d_test(NAME TestVolume DATA HeadMRVolume.mhd ARGS -v --camera-position=127.5,-400,127.5 --camera-view-up=0,0,1 LONG_TIMEOUT) -f3d_test(NAME TestVolumeInverse DATA HeadMRVolume.mhd ARGS -vi --camera-position=127.5,-400,127.5 --camera-view-up=0,0,1 LONG_TIMEOUT) -f3d_test(NAME TestVolumeMag DATA vase_4comp.vti ARGS -vb LONG_TIMEOUT) -f3d_test(NAME TestVolumeComp DATA vase_4comp.vti ARGS -vb --comp=3 LONG_TIMEOUT) -f3d_test(NAME TestVolumeDirect DATA vase_4comp.vti ARGS -vb --comp=-2 LONG_TIMEOUT) -f3d_test(NAME TestVolumeCells DATA waveletArrays.vti ARGS -vb --cells LONG_TIMEOUT) +f3d_test(NAME TestVolume DATA HeadMRVolume.mhd ARGS -v --camera-position=127.5,-400,127.5 --camera-view-up=0,0,1) +f3d_test(NAME TestVolumeInverse DATA HeadMRVolume.mhd ARGS -vi --camera-position=127.5,-400,127.5 --camera-view-up=0,0,1) +f3d_test(NAME TestVolumeMag DATA vase_4comp.vti ARGS -vb) +f3d_test(NAME TestVolumeComp DATA vase_4comp.vti ARGS -vb --comp=3) +f3d_test(NAME TestVolumeDirect DATA vase_4comp.vti ARGS -vb --comp=-2) +f3d_test(NAME TestVolumeCells DATA waveletArrays.vti ARGS -vb --cells) f3d_test(NAME TestVolumeColoringArray DATA waveletArrays.vti ARGS -vb --coloring-array=Result LONG_TIMEOUT) f3d_test(NAME TestTextureNormal DATA WaterBottle.glb ARGS --texture-normal=${F3D_SOURCE_DIR}/testing/data/normal.png --normal-scale=0.1) f3d_test(NAME TestTextureMaterial DATA WaterBottle.glb ARGS --texture-material=${F3D_SOURCE_DIR}/testing/data/red_mod.jpg --roughness=1 --metallic=1) @@ -476,16 +476,16 @@ if(VTK_VERSION VERSION_GREATER_EQUAL 9.2.20221220) if(F3D_MODULE_RAYTRACING) # XXX: These tests are impacted by https://github.com/f3d-app/f3d/issues/933 f3d_test(NAME TestHDRIRaytracing DATA suzanne.ply HDRI palermo_park_1k.hdr ARGS -rd --samples=4) - f3d_test(NAME TestHDRIRaytracingSkyboxOnly DATA suzanne.ply ARGS --hdri-file=${F3D_SOURCE_DIR}/testing/data/palermo_park_1k.hdr --hdri-skybox -rd --samples=4) + f3d_test(NAME TestHDRIRaytracingSkyboxOnly DATA suzanne.ply ARGS --hdri-file=${F3D_SOURCE_DIR}/testing/data/palermo_park_1k.hdr --hdri-skybox -rd --samples=4 LONG_TIMEOUT) f3d_test(NAME TestHDRIRaytracingAmbientOnly DATA suzanne.ply ARGS --hdri-file=${F3D_SOURCE_DIR}/testing/data/palermo_park_1k.hdr --hdri-ambient -rd --samples=4 LONG_TIMEOUT) f3d_test(NAME TestHDRIRaytracingAmbientOnlyNoBackground DATA suzanne.ply ARGS --hdri-file=${F3D_SOURCE_DIR}/testing/data/palermo_park_1k.hdr --hdri-ambient -rd --samples=4 --no-background LONG_TIMEOUT) - f3d_test(NAME TestHDRIRaytracingNone DATA suzanne.ply ARGS --hdri-file=${F3D_SOURCE_DIR}/testing/data/palermo_park_1k.hdr -rd --samples=4) + f3d_test(NAME TestHDRIRaytracingNone DATA suzanne.ply ARGS --hdri-file=${F3D_SOURCE_DIR}/testing/data/palermo_park_1k.hdr -rd --samples=4 LONG_TIMEOUT) f3d_test(NAME TestInteractionHDRIRaytracingRemoveSkybox DATA suzanne.ply HDRI palermo_park_1k.hdr ARGS -rd --samples=4 INTERACTION) f3d_test(NAME TestInteractionHDRIRaytracingRemoveAmbient DATA suzanne.ply HDRI palermo_park_1k.hdr ARGS -rd --samples=4 INTERACTION) f3d_test(NAME TestInteractionHDRIRaytracingRemoveBoth DATA suzanne.ply HDRI palermo_park_1k.hdr ARGS -rd --samples=4 INTERACTION) f3d_test(NAME TestInteractionHDRIRaytracingLoop DATA suzanne.ply HDRI palermo_park_1k.hdr ARGS -rd --samples=4 INTERACTION) - f3d_test(NAME TestInteractionHDRIRaytracingFullFromNone DATA suzanne.ply ARGS --hdri-file=${F3D_SOURCE_DIR}/testing/data/palermo_park_1k.hdr -rd --samples=4 INTERACTION) + f3d_test(NAME TestInteractionHDRIRaytracingFullFromNone DATA suzanne.ply ARGS --hdri-file=${F3D_SOURCE_DIR}/testing/data/palermo_park_1k.hdr -rd --samples=4 INTERACTION LONG_TIMEOUT) endif() endif() @@ -515,7 +515,7 @@ if(F3D_MODULE_RAYTRACING) f3d_test(NAME TestRaytracingThumbnailConfigFile DATA dragon.vtu CONFIG thumbnail_build ARGS -rd --samples=4 LONG_TIMEOUT TONE_MAPPING) endif() - f3d_test(NAME TestRaytracingNoBackground DATA suzanne.ply ARGS -rd --samples=4 --no-background LONG_TIMEOUT) + f3d_test(NAME TestRaytracingNoBackground DATA suzanne.ply ARGS -rd --samples=4 --no-background) else(F3D_MODULE_RAYTRACING) f3d_test(NAME TestInteractionRaytracingDenoiseNoRaytracing DATA suzanne.ply INTERACTION NO_BASELINE REGEXP "Raytracing options can't be used if F3D has not been built with raytracing") #RD @@ -743,11 +743,11 @@ f3d_test(NAME TestFinalShaderCompilationFailure DATA cow.vtp ARGS --final-shader ## Interaction Tests # Test hotkeys -f3d_test(NAME TestInteractionPostFX DATA cow.vtp INTERACTION TONE_MAPPING) #PQAT +f3d_test(NAME TestInteractionPostFX DATA cow.vtp INTERACTION TONE_MAPPING LONG_TIMEOUT) #PQAT f3d_test(NAME TestInteractionActors DATA cow.vtp INTERACTION) #EXGMN -f3d_test(NAME TestInteractionTimer DATA cow.vtp NO_BASELINE INTERACTION) #Z +f3d_test(NAME TestInteractionTimer DATA cow.vtp NO_BASELINE INTERACTION LONG_TIMEOUT) #Z f3d_test(NAME TestInteractionMisc DATA cow.vtp NO_BASELINE INTERACTION) #KK -f3d_test(NAME TestInteractionCycleCell DATA waveletArrays.vti INTERACTION) #VCCC +f3d_test(NAME TestInteractionCycleCell DATA waveletArrays.vti INTERACTION LONG_TIMEOUT) #VCCC f3d_test(NAME TestInteractionCycleComp DATA dragon.vtu INTERACTION) #SYYYY f3d_test(NAME TestInteractionCycleScalars DATA dragon.vtu INTERACTION) #BSSSS f3d_test(NAME TestInteractionCycleCellInvalidIndex DATA waveletArrays.vti INTERACTION) #SSC @@ -761,7 +761,7 @@ f3d_test(NAME TestInteractionDirectoryLoop DATA mb/recursive INTERACTION ARGS -- f3d_test(NAME TestInteractionDirectoryEmpty DATA mb INTERACTION NO_DATA_FORCE_RENDER) #Right;Right;Right; f3d_test(NAME TestInteractionDirectoryEmptyVerbose DATA mb ARGS --verbose NO_BASELINE INTERACTION REGEXP "is not a file of a supported file format") #Right;Right;Right;HMCSY f3d_test(NAME TestInteractionAnimationNotStopped DATA InterpolationTest.glb NO_BASELINE INTERACTION)#Space; -f3d_test(NAME TestInteractionResetCamera DATA dragon.vtu INTERACTION)#MouseMovements;Return; +f3d_test(NAME TestInteractionResetCamera DATA dragon.vtu INTERACTION LONG_TIMEOUT)#MouseMovements;Return; f3d_test(NAME TestInteractionResetCameraWithCameraIndex DATA CameraAnimated.glb ARGS --camera-index=0 INTERACTION)#MouseMovements;Return; f3d_test(NAME TestInteractionTensorsCycleComp DATA tensors.vti ARGS --scalar-coloring --comp=-2 INTERACTION) #SYYYYYYYYYY f3d_test(NAME TestInteractionCycleScalarsCompCheck DATA dragon.vtu ARGS -b --scalar-coloring --comp=2 INTERACTION) #S @@ -772,10 +772,10 @@ f3d_test(NAME TestInteractionDumpSceneState DATA dragon.vtu NO_BASELINE INTERACT f3d_test(NAME TestInteractionCycleVerbose DATA dragon.vtu ARGS --verbose -s NO_BASELINE INTERACTION REGEXP "Not coloring")#SSSSYC f3d_test(NAME TestInteractionEmptyDrop INTERACTION REGEXP "Drop event without any provided files.")#DropEvent Empty; f3d_test(NAME TestInteractionCameraUpdate DATA dragon.vtu INTERACTION) #MouseWheel;MouseWheel;MouseWheel;S -f3d_test(NAME TestInteractionFocalPointPickingDefault DATA dragon.vtu INTERACTION) -f3d_test(NAME TestInteractionFocalPointPickingShift DATA dragon.vtu INTERACTION) +f3d_test(NAME TestInteractionFocalPointPickingDefault DATA dragon.vtu INTERACTION LONG_TIMEOUT) +f3d_test(NAME TestInteractionFocalPointPickingShift DATA dragon.vtu INTERACTION LONG_TIMEOUT) f3d_test(NAME TestInteractionFocalPointPickingPoints DATA pointsCloud.vtp INTERACTION) -f3d_test(NAME TestInteractionLightIntensity DATA dragon.vtu INTERACTION) +f3d_test(NAME TestInteractionLightIntensity DATA dragon.vtu INTERACTION LONG_TIMEOUT) f3d_test(NAME TestInteractionMultiFileColoring DATA mb/recursive ARGS --multi-file-mode=all INTERACTION) #SSSB f3d_test(NAME TestInteractionReload DATA dragon.vtu ARGS -e INTERACTION) #Up; f3d_test(NAME TestInteractionLoadParentDirectory DATA multi/dragon.vtu ARGS --filename INTERACTION) #Down; From 19060af103b7e4b443c989229fc129a36f8fb2d7 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Mon, 25 Nov 2024 18:15:03 +0100 Subject: [PATCH 4/5] again --- .github/actions/generic-ci/action.yml | 4 ++-- application/testing/CMakeLists.txt | 4 ++-- library/testing/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/generic-ci/action.yml b/.github/actions/generic-ci/action.yml index 0fd0c7849e..8d9797b2e0 100644 --- a/.github/actions/generic-ci/action.yml +++ b/.github/actions/generic-ci/action.yml @@ -170,7 +170,7 @@ runs: -DF3D_TESTING_ENABLE_EXTERNAL_GLFW=${{ (runner.os == 'Linux' && inputs.rendering_backend == 'auto') && 'ON' || 'OFF' }} -DF3D_TESTING_ENABLE_EXTERNAL_QT=${{ (runner.os == 'Linux' && inputs.rendering_backend == 'auto') && 'ON' || 'OFF' }} -DF3D_TESTING_ENABLE_GLX_TESTS=${{ (runner.os == 'Linux' && inputs.rendering_backend == 'auto') && 'ON' || 'OFF' }} - -DF3D_TESTING_ENABLE_LONG_TIMEOUT_TESTS=${{ (runner.os != 'macOS' || inputs.cpu == 'x86_64') && 'OFF' || 'ON' }} + -DF3D_TESTING_ENABLE_LONG_TIMEOUT_TESTS=${{ (runner.os == 'Linux' || runner.os == 'Windows') && 'ON' || 'OFF' }} -DF3D_TESTING_ENABLE_OSMESA_TESTS=${{ runner.os == 'Linux' && 'ON' || 'OFF' }} -DF3D_TESTING_FORCE_RENDERING_BACKEND=${{ inputs.rendering_backend }} -DF3D_WINDOWS_GUI=ON @@ -222,7 +222,7 @@ runs: runner.os == 'macOS' && inputs.cpu == 'arm64' shell: bash - run: echo "F3D_CTEST_EXCEPTIONS=(TestDepthPeelingToneMapping)|(TestDepthPeeling)|(TestTextureColor)|(TestDXF)|(TestScalarsCell)|(TestXCAFColors)|(TestGrid)|(TestConfig)|(TestGLTFDracoImporter)|(TestSDKInteractorCallBack)|(TestInteractionActors)|(TestDefaultConfigFile.*)|(TestThumbnailConfigFile.*)|(TestInteractionCycleAnimation)|(TestInteractionCycleAnimation)|(TestInteractionAnimationSlow)" >> $GITHUB_ENV + run: echo "F3D_CTEST_EXCEPTIONS=(TestDepthPeelingToneMapping)|(TestDepthPeeling)|(TestTextureColor)|(TestDXF)|(TestScalarsCell)|(TestXCAFColors)|(TestGrid)|(TestConfig)|(TestGLTFDracoImporter)|(TestInteractionActors)|(TestInteractionFocalPointPickingPoints)|(TestInteractionCycleAnimation)|(TestInteractionAnimationSlow)" >> $GITHUB_ENV - name: Test shell: bash diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt index d009244f5e..25366ffe48 100644 --- a/application/testing/CMakeLists.txt +++ b/application/testing/CMakeLists.txt @@ -394,13 +394,13 @@ if(F3D_MODULE_RAYTRACING) f3d_test(NAME TestInteractionCheatsheetRaytracing DATA cow.vtp INTERACTION) #H f3d_test(NAME TestInteractionCheatsheetWhiteBGRaytracing DATA cow.vtp ARGS --bg-color=1,1,1 INTERACTION) #H f3d_test(NAME TestInteractionCheatsheetBlackBGRaytracing DATA cow.vtp ARGS --bg-color=0,0,0 INTERACTION) #H - f3d_test(NAME TestInteractionCheatsheetScalarsRaytracing DATA dragon.vtu ARGS --scalar-coloring --comp=-2 INTERACTION) #HSSS + f3d_test(NAME TestInteractionCheatsheetScalarsRaytracing DATA dragon.vtu ARGS --scalar-coloring --comp=-2 INTERACTION LONG_TIMEOUT) #HSSS f3d_test(NAME TestInteractionNoFileCheatsheetRaytracing INTERACTION NO_DATA_FORCE_RENDER) #HXZM else() f3d_test(NAME TestInteractionCheatsheet DATA cow.vtp INTERACTION) #H f3d_test(NAME TestInteractionCheatsheetWhiteBG DATA cow.vtp ARGS --bg-color=1,1,1 INTERACTION) #H f3d_test(NAME TestInteractionCheatsheetBlackBG DATA cow.vtp ARGS --bg-color=0,0,0 INTERACTION) #H - f3d_test(NAME TestInteractionCheatsheetScalars DATA dragon.vtu ARGS --scalar-coloring --comp=-2 INTERACTION) #HSSS + f3d_test(NAME TestInteractionCheatsheetScalars DATA dragon.vtu ARGS --scalar-coloring --comp=-2 INTERACTION LONG_TIMEOUT) #HSSS f3d_test(NAME TestInteractionNoFileCheatsheet INTERACTION NO_DATA_FORCE_RENDER) #HXZM endif() diff --git a/library/testing/CMakeLists.txt b/library/testing/CMakeLists.txt index dc628c15fd..9e432c40cd 100644 --- a/library/testing/CMakeLists.txt +++ b/library/testing/CMakeLists.txt @@ -142,7 +142,7 @@ Test Print Debug\nTest Print Info\nTest Print Warning\nTest Print Error\n\ Test Debug Coloring") if(VTK_VERSION VERSION_GREATER_EQUAL 9.2.20221220) - set_tests_properties(libf3d::TestSDKDynamicHDRI PROPERTIES TIMEOUT 90) + set_tests_properties(libf3d::TestSDKDynamicHDRI PROPERTIES TIMEOUT 120) if(NOT F3D_TESTING_ENABLE_LONG_TIMEOUT_TESTS) set_tests_properties(libf3d::TestSDKDynamicHDRI PROPERTIES DISABLED ON) endif() From 5bf302356d38fb158cd540d22c5ff019730a243e Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Tue, 26 Nov 2024 22:16:56 +0100 Subject: [PATCH 5/5] more exceptions --- .github/actions/generic-ci/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/generic-ci/action.yml b/.github/actions/generic-ci/action.yml index 8d9797b2e0..ff250dc019 100644 --- a/.github/actions/generic-ci/action.yml +++ b/.github/actions/generic-ci/action.yml @@ -211,7 +211,7 @@ runs: runner.os == 'macOS' && inputs.cpu == 'x86_64' shell: bash - run: echo "F3D_CTEST_EXCEPTIONS=(TestDXF)|(TestScalarsCell)|(TestXCAFColors)|(TestInteractionAnimationSlow)|(TestInteractionFocalPointPickingPoints)|(TestInteractionCycleAnimation)" >> $GITHUB_ENV + run: echo "F3D_CTEST_EXCEPTIONS=(TestDXF)|(TestScalarsCell)|(TestXCAFColors)|(TestInteractionAnimationSlow)|(TestInteractionFocalPointPickingPoints)|(TestInteractionCycleAnimation)|(TestInteractionCycleComp)" >> $GITHUB_ENV # Certain tests are failing on macOS arm64 for unknown reasons # https://github.com/f3d-app/f3d/issues/1276