From a62313b1dd9258c7be2cb738930bf0c40891e8df Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 13 Jan 2025 14:51:02 -0500 Subject: Tests: Fix testing with MinGW without VS installed --- .../Import/install-RUNTIME_DEPENDENCIES/check_installed.cmake | 2 +- Tests/RunCMake/CommandLine/Envgen-bad-help-stdout.txt | 2 +- Tests/RunCMake/CommandLine/Envgen-bad-stderr.txt | 2 +- Tests/RunCMake/CommandLine/Envgen-unset-stderr.txt | 2 +- Tests/RunCMake/CommandLine/Envgen-warnings-stderr.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Tests/ExportImport/Import/install-RUNTIME_DEPENDENCIES/check_installed.cmake b/Tests/ExportImport/Import/install-RUNTIME_DEPENDENCIES/check_installed.cmake index 447a5b6..8b193f6 100644 --- a/Tests/ExportImport/Import/install-RUNTIME_DEPENDENCIES/check_installed.cmake +++ b/Tests/ExportImport/Import/install-RUNTIME_DEPENDENCIES/check_installed.cmake @@ -4,7 +4,7 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") check_installed([[^lib;lib/libdep8\.so;lib/liblib\.so;subdir;subdir/bin;subdir/bin/exe1;subdir/bin/exe2;subdir/lib;subdir/lib/libdep10\.so;subdir/lib/libdep11\.so;subdir/lib/libdep2\.so\.1;subdir/lib/libdep2\.so\.1\.2\.3;subdir/lib/libdep3\.so;subdir/lib/libdep5\.so;subdir/lib/libdep6\.so;subdir/lib/libdep8\.so;subdir/lib/libdep9\.so;subdir/lib/liblib\.so;subdir/lib/libmod\.so;subdir/lib/libsublib1\.so$]]) elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") set(_msvc_check [[bin;bin/dep8\.dll;bin/lib\.dll;lib;lib/lib\.(lib|l);subdir;subdir/bin;subdir/bin/dep10\.dll;subdir/bin/dep11\.dll;subdir/bin/dep2\.dll;subdir/bin/dep3\.dll;subdir/bin/dep5\.dll;subdir/bin/dep6\.dll;subdir/bin/dep8\.dll;subdir/bin/dep9\.dll;subdir/bin/exe1\.exe;subdir/bin/exe2\.exe;subdir/bin/lib\.dll;subdir/bin/sublib1\.dll;subdir/lib;subdir/lib/mod\.dll]]) - set(_mingw_check [[bin;bin/libdep8\.dll;bin/liblib\.dll;lib;lib/liblib\.dll\.a;lib/liblib\.lib;subdir;subdir/bin;subdir/bin/exe1\.exe;subdir/bin/exe2\.exe;subdir/bin/libdep10\.dll;subdir/bin/libdep11\.dll;subdir/bin/libdep2\.dll;subdir/bin/libdep3\.dll;subdir/bin/libdep5\.dll;subdir/bin/libdep6\.dll;subdir/bin/libdep8\.dll;subdir/bin/libdep9\.dll;subdir/bin/liblib\.dll;subdir/bin/libsublib1\.dll;subdir/lib;subdir/lib/libmod\.dll]]) + set(_mingw_check [[bin;bin/libdep8\.dll;bin/liblib\.dll;lib;lib/liblib\.dll\.a(;lib/liblib\.lib)?;subdir;subdir/bin;subdir/bin/exe1\.exe;subdir/bin/exe2\.exe;subdir/bin/libdep10\.dll;subdir/bin/libdep11\.dll;subdir/bin/libdep2\.dll;subdir/bin/libdep3\.dll;subdir/bin/libdep5\.dll;subdir/bin/libdep6\.dll;subdir/bin/libdep8\.dll;subdir/bin/libdep9\.dll;subdir/bin/liblib\.dll;subdir/bin/libsublib1\.dll;subdir/lib;subdir/lib/libmod\.dll]]) check_installed("^(${_msvc_check}|${_mingw_check})$") elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") check_installed([[^lib;lib/libdep8\.dylib;lib/liblib\.dylib;subdir;subdir/bin;subdir/bin/exe1;subdir/bin/exe2;subdir/frameworks;subdir/frameworks/dep9\.framework;subdir/frameworks/dep9\.framework/Resources;subdir/frameworks/dep9\.framework/Versions;subdir/frameworks/dep9\.framework/Versions/A;subdir/frameworks/dep9\.framework/Versions/A/Resources;subdir/frameworks/dep9\.framework/Versions/A/Resources/Info\.plist(;subdir/frameworks/dep9.framework/Versions/A/_CodeSignature;subdir/frameworks/dep9.framework/Versions/A/_CodeSignature/CodeResources)?;subdir/frameworks/dep9\.framework/Versions/A/dep9;subdir/frameworks/dep9\.framework/Versions/Current;subdir/frameworks/dep9\.framework/dep9;subdir/lib;subdir/lib/libdep10\.dylib;subdir/lib/libdep11\.dylib;subdir/lib/libdep2\.1\.2\.3\.dylib;subdir/lib/libdep2\.1\.dylib;subdir/lib/libdep3\.dylib;subdir/lib/libdep5\.dylib;subdir/lib/libdep6\.dylib;subdir/lib/libdep8\.dylib;subdir/lib/liblib\.dylib;subdir/lib/libmod\.so;subdir/lib/libsublib1\.dylib$]]) diff --git a/Tests/RunCMake/CommandLine/Envgen-bad-help-stdout.txt b/Tests/RunCMake/CommandLine/Envgen-bad-help-stdout.txt index 075c48c..cd43295 100644 --- a/Tests/RunCMake/CommandLine/Envgen-bad-help-stdout.txt +++ b/Tests/RunCMake/CommandLine/Envgen-bad-help-stdout.txt @@ -1,2 +1,2 @@ Generators.* -\* (Unix Makefiles|Visual Studio).* +\* (Unix Makefiles|NMake Makefiles|Visual Studio).* diff --git a/Tests/RunCMake/CommandLine/Envgen-bad-stderr.txt b/Tests/RunCMake/CommandLine/Envgen-bad-stderr.txt index 4a1215e..aebe93a 100644 --- a/Tests/RunCMake/CommandLine/Envgen-bad-stderr.txt +++ b/Tests/RunCMake/CommandLine/Envgen-bad-stderr.txt @@ -2,4 +2,4 @@ CMake Error: CMAKE_GENERATOR was set but the specified generator doesn't exist. Using CMake default. Generators.* -\* (Unix Makefiles|Visual Studio).* +\* (Unix Makefiles|NMake Makefiles|Visual Studio).* diff --git a/Tests/RunCMake/CommandLine/Envgen-unset-stderr.txt b/Tests/RunCMake/CommandLine/Envgen-unset-stderr.txt index ec6ec92..12085ad 100644 --- a/Tests/RunCMake/CommandLine/Envgen-unset-stderr.txt +++ b/Tests/RunCMake/CommandLine/Envgen-unset-stderr.txt @@ -1,4 +1,4 @@ ^CMake Error: No generator specified for -G Generators.* -\* (Unix Makefiles|Visual Studio).* +\* (Unix Makefiles|NMake Makefiles|Visual Studio).* diff --git a/Tests/RunCMake/CommandLine/Envgen-warnings-stderr.txt b/Tests/RunCMake/CommandLine/Envgen-warnings-stderr.txt index 47f9c9e..68d1d12 100644 --- a/Tests/RunCMake/CommandLine/Envgen-warnings-stderr.txt +++ b/Tests/RunCMake/CommandLine/Envgen-warnings-stderr.txt @@ -4,4 +4,4 @@ Warning: Environment variable CMAKE_GENERATOR_TOOLSET will be ignored, because C CMake Error: No generator specified for -G Generators.* -\* (Unix Makefiles|Visual Studio).* +\* (Unix Makefiles|NMake Makefiles|Visual Studio).* -- cgit v0.12