From 2cc7664dd962fe1347c4b1bf54523ffc17587b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=7C=C2=B0=5F=C2=B0=7C?= Date: Tue, 19 Nov 2024 12:14:24 +0100 Subject: [PATCH] rename --dry-run by --no-config find . -name "*\.txt" -exec sed -i 's/--dry-run/--no-config/g' {} \; --- application/testing/CMakeLists.txt | 8 ++++---- examples/plugins/example-plugin/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt index 16b7723c56..58abc6466f 100644 --- a/application/testing/CMakeLists.txt +++ b/application/testing/CMakeLists.txt @@ -6,7 +6,7 @@ function(f3d_test) if(F3D_TEST_CONFIG) list(APPEND F3D_TEST_ARGS "--config=${F3D_TEST_CONFIG}") else() - list(APPEND F3D_TEST_ARGS "--dry-run") + list(APPEND F3D_TEST_ARGS "--no-config") endif() if (F3D_TEST_DATA) @@ -250,17 +250,17 @@ endif() function(f3d_ss_test) cmake_parse_arguments(F3D_SS_TEST "MINIMAL" "NAME;TEMPLATE;EXPECTED;DEPENDS" "ARGS" ${ARGN}) if(NOT F3D_SS_TEST_MINIMAL) - f3d_test(NAME TestScreenshot${F3D_SS_TEST_NAME} DATA suzanne.ply ARGS --screenshot-filename=${F3D_SS_TEST_TEMPLATE} --dry-run --interaction-test-play=${F3D_SOURCE_DIR}/testing/recordings/TestScreenshot.log NO_BASELINE DEPENDS TestSetupScreenshots) + f3d_test(NAME TestScreenshot${F3D_SS_TEST_NAME} DATA suzanne.ply ARGS --screenshot-filename=${F3D_SS_TEST_TEMPLATE} --no-config --interaction-test-play=${F3D_SOURCE_DIR}/testing/recordings/TestScreenshot.log NO_BASELINE DEPENDS TestSetupScreenshots) f3d_test(NAME TestScreenshot${F3D_SS_TEST_NAME}File DATA suzanne.ply ARGS --ref=${F3D_SS_TEST_EXPECTED} DEPENDS TestScreenshot${F3D_SS_TEST_NAME} ${F3D_SS_TEST_DEPENDS} NO_BASELINE) else() # show filename, axes, fps before the "minimal screenshot" interaction; compare with --no-background only - f3d_test(NAME TestScreenshot${F3D_SS_TEST_NAME} DATA suzanne.ply ARGS --screenshot-filename=${F3D_SS_TEST_TEMPLATE} --dry-run -nxz --interaction-test-play=${F3D_SOURCE_DIR}/testing/recordings/TestScreenshotMinimal.log NO_BASELINE DEPENDS TestSetupScreenshots) + f3d_test(NAME TestScreenshot${F3D_SS_TEST_NAME} DATA suzanne.ply ARGS --screenshot-filename=${F3D_SS_TEST_TEMPLATE} --no-config -nxz --interaction-test-play=${F3D_SOURCE_DIR}/testing/recordings/TestScreenshotMinimal.log NO_BASELINE DEPENDS TestSetupScreenshots) f3d_test(NAME TestScreenshot${F3D_SS_TEST_NAME}File DATA suzanne.ply ARGS --no-background --ref=${F3D_SS_TEST_EXPECTED} DEPENDS TestScreenshot${F3D_SS_TEST_NAME} ${F3D_SS_TEST_DEPENDS} NO_BASELINE) endif() endfunction() function(f3d_ss_template_test) cmake_parse_arguments(F3D_SS_TEMPLATE_TEST "" "NAME;TEMPLATE;EXPECTED_REGEX" "ARGS" ${ARGN}) - f3d_test(NAME TestScreenshot${F3D_SS_TEMPLATE_TEST_NAME} DATA suzanne.ply ARGS --screenshot-filename=${F3D_SS_TEMPLATE_TEST_TEMPLATE} --dry-run --interaction-test-play=${F3D_SOURCE_DIR}/testing/recordings/TestScreenshot.log + f3d_test(NAME TestScreenshot${F3D_SS_TEMPLATE_TEST_NAME} DATA suzanne.ply ARGS --screenshot-filename=${F3D_SS_TEMPLATE_TEST_TEMPLATE} --no-config --interaction-test-play=${F3D_SOURCE_DIR}/testing/recordings/TestScreenshot.log REGEXP "saving screenshot to .+[/\\]${F3D_SS_TEMPLATE_TEST_EXPECTED_REGEX}" NO_BASELINE DEPENDS TestSetupScreenshots) endfunction() diff --git a/examples/plugins/example-plugin/CMakeLists.txt b/examples/plugins/example-plugin/CMakeLists.txt index 2c850e1429..7a5d2d8579 100644 --- a/examples/plugins/example-plugin/CMakeLists.txt +++ b/examples/plugins/example-plugin/CMakeLists.txt @@ -32,7 +32,7 @@ if(BUILD_TESTING) find_package(f3d REQUIRED COMPONENTS application) add_test(NAME TestPluginExample COMMAND "$" - "--dry-run" + "--no-config" "--no-render" "--verbose" "--load-plugins=$"