From c5783e4f334e9af3db654793b6752da49e99a079 Mon Sep 17 00:00:00 2001 From: Mathieu Westphal Date: Sat, 28 Dec 2024 12:22:42 +0100 Subject: [PATCH] fixup testing --- application/testing/CMakeLists.txt | 7 ++++--- testing/data/invalid.dll | 3 --- 2 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 testing/data/invalid.dll diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt index 8c36fb28e3..b1b97e0ae1 100644 --- a/application/testing/CMakeLists.txt +++ b/application/testing/CMakeLists.txt @@ -328,12 +328,13 @@ endif() f3d_test(NAME TestPluginVerbose ARGS --verbose REGEXP "Loading plugin \"native\"" NO_BASELINE) f3d_test(NAME TestPluginNonExistent ARGS --load-plugins=dummy REGEXP "Plugin failed to load" NO_BASELINE) if(WIN32) - f3d_test(NAME TestPluginInvalid ARGS --load-plugins=${F3D_SOURCE_DIR}/testing/data/invalid.dll REGEXP "file too short" NO_BASELINE) + set(_TEST_PLUGIN_INVALID_REGEXP "is not a valid Win32 application") elseif(APPLE) - f3d_test(NAME TestPluginInvalid ARGS --load-plugins=${F3D_SOURCE_DIR}/testing/data/invalid.so REGEXP "not a mach-o file" NO_BASELINE) + set(_TEST_PLUGIN_INVALID_REGEXP "not a mach-o file") else() - f3d_test(NAME TestPluginInvalid ARGS --load-plugins=${F3D_SOURCE_DIR}/testing/data/invalid.so REGEXP "file too short" NO_BASELINE) + set(_TEST_PLUGIN_INVALID_REGEXP "file too short") endif() +f3d_test(NAME TestPluginInvalid ARGS --load-plugins=${F3D_SOURCE_DIR}/testing/data/invalid.so REGEXP ${_TEST_PLUGIN_INVALID_REGEXP} NO_BASELINE) if(UNIX AND NOT APPLE) f3d_test(NAME TestPluginInvalidSystem ARGS --verbose --load-plugins=invalid REGEXP "file too short" ENV "LD_LIBRARY_PATH=${F3D_SOURCE_DIR}/testing/data" NO_BASELINE) diff --git a/testing/data/invalid.dll b/testing/data/invalid.dll deleted file mode 100644 index 8575163cc5..0000000000 --- a/testing/data/invalid.dll +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2df53aec82f9d93ad26e57748dd2e61299bb3a1cf14f55005f180e75e960789 -size 28