From 3bbe66e971dfe84dcffa702c2673fb136da0a508 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Thu, 26 Oct 2023 19:23:20 +0300 Subject: Condense test directories for RC1. --- test cases/cmake/26 dependency fallback/main.cpp | 10 -------- .../cmake/26 dependency fallback/meson.build | 30 ---------------------- .../subprojects/broken_method.wrap | 2 -- .../26 dependency fallback/subprojects/cmMod.wrap | 5 ---- .../subprojects/cmMod/CMakeLists.txt | 20 --------------- .../subprojects/cmMod/cmMod.cpp | 15 ----------- .../subprojects/cmMod/cmMod.hpp | 18 ------------- .../subprojects/cmMod/cpp_pch.hpp | 2 -- .../subprojects/cmake_subp/CMakeLists.txt | 2 -- .../subprojects/force_cmake.wrap | 2 -- .../subprojects/force_cmake/CMakeLists.txt | 2 -- .../subprojects/force_cmake/meson.build | 4 --- .../subprojects/meson_method.wrap | 2 -- .../subprojects/meson_subp/meson.build | 1 - test cases/cmake/27 dependency fallback/main.cpp | 10 ++++++++ .../cmake/27 dependency fallback/meson.build | 30 ++++++++++++++++++++++ .../subprojects/broken_method.wrap | 2 ++ .../27 dependency fallback/subprojects/cmMod.wrap | 5 ++++ .../subprojects/cmMod/CMakeLists.txt | 20 +++++++++++++++ .../subprojects/cmMod/cmMod.cpp | 15 +++++++++++ .../subprojects/cmMod/cmMod.hpp | 18 +++++++++++++ .../subprojects/cmMod/cpp_pch.hpp | 2 ++ .../subprojects/cmake_subp/CMakeLists.txt | 2 ++ .../subprojects/force_cmake.wrap | 2 ++ .../subprojects/force_cmake/CMakeLists.txt | 2 ++ .../subprojects/force_cmake/meson.build | 4 +++ .../subprojects/meson_method.wrap | 2 ++ .../subprojects/meson_subp/meson.build | 1 + 28 files changed, 115 insertions(+), 115 deletions(-) delete mode 100644 test cases/cmake/26 dependency fallback/main.cpp delete mode 100644 test cases/cmake/26 dependency fallback/meson.build delete mode 100644 test cases/cmake/26 dependency fallback/subprojects/broken_method.wrap delete mode 100644 test cases/cmake/26 dependency fallback/subprojects/cmMod.wrap delete mode 100644 test cases/cmake/26 dependency fallback/subprojects/cmMod/CMakeLists.txt delete mode 100644 test cases/cmake/26 dependency fallback/subprojects/cmMod/cmMod.cpp delete mode 100644 test cases/cmake/26 dependency fallback/subprojects/cmMod/cmMod.hpp delete mode 100644 test cases/cmake/26 dependency fallback/subprojects/cmMod/cpp_pch.hpp delete mode 100644 test cases/cmake/26 dependency fallback/subprojects/cmake_subp/CMakeLists.txt delete mode 100644 test cases/cmake/26 dependency fallback/subprojects/force_cmake.wrap delete mode 100644 test cases/cmake/26 dependency fallback/subprojects/force_cmake/CMakeLists.txt delete mode 100644 test cases/cmake/26 dependency fallback/subprojects/force_cmake/meson.build delete mode 100644 test cases/cmake/26 dependency fallback/subprojects/meson_method.wrap delete mode 100644 test cases/cmake/26 dependency fallback/subprojects/meson_subp/meson.build create mode 100644 test cases/cmake/27 dependency fallback/main.cpp create mode 100644 test cases/cmake/27 dependency fallback/meson.build create mode 100644 test cases/cmake/27 dependency fallback/subprojects/broken_method.wrap create mode 100644 test cases/cmake/27 dependency fallback/subprojects/cmMod.wrap create mode 100644 test cases/cmake/27 dependency fallback/subprojects/cmMod/CMakeLists.txt create mode 100644 test cases/cmake/27 dependency fallback/subprojects/cmMod/cmMod.cpp create mode 100644 test cases/cmake/27 dependency fallback/subprojects/cmMod/cmMod.hpp create mode 100644 test cases/cmake/27 dependency fallback/subprojects/cmMod/cpp_pch.hpp create mode 100644 test cases/cmake/27 dependency fallback/subprojects/cmake_subp/CMakeLists.txt create mode 100644 test cases/cmake/27 dependency fallback/subprojects/force_cmake.wrap create mode 100644 test cases/cmake/27 dependency fallback/subprojects/force_cmake/CMakeLists.txt create mode 100644 test cases/cmake/27 dependency fallback/subprojects/force_cmake/meson.build create mode 100644 test cases/cmake/27 dependency fallback/subprojects/meson_method.wrap create mode 100644 test cases/cmake/27 dependency fallback/subprojects/meson_subp/meson.build (limited to 'test cases/cmake') diff --git a/test cases/cmake/26 dependency fallback/main.cpp b/test cases/cmake/26 dependency fallback/main.cpp deleted file mode 100644 index 95079615a..000000000 --- a/test cases/cmake/26 dependency fallback/main.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include - -using namespace std; - -int main(void) { - cmModClass obj("Hello"); - cout << obj.getStr() << endl; - return 0; -} diff --git a/test cases/cmake/26 dependency fallback/meson.build b/test cases/cmake/26 dependency fallback/meson.build deleted file mode 100644 index 871d70c9f..000000000 --- a/test cases/cmake/26 dependency fallback/meson.build +++ /dev/null @@ -1,30 +0,0 @@ -project('cmakeSubTest', ['c', 'cpp']) - -# Fallback to a CMake subproject -sub_dep = dependency('cmModLib++') -exe1 = executable('main', ['main.cpp'], dependencies: [sub_dep]) -test('test1', exe1) - -# Subproject contains both meson.build and CMakeLists.txt. It should default -# to meson but wrap force cmake. -subproject('force_cmake') - -testcase expect_error('Wrap method \'notfound\' is not supported, must be one of: meson, cmake, cargo') - subproject('broken_method') -endtestcase - -# With method=meson we can't use cmake.subproject() -cmake = import('cmake') -testcase expect_error('Wrap method is \'meson\' but we are trying to configure it with cmake') - cmake.subproject('meson_method') -endtestcase - -# cmake.subproject() force cmake method even if meson.build exists. -testcase expect_error('Subproject exists but has no CMakeLists.txt file.') - cmake.subproject('meson_subp') -endtestcase - -# Without specifying the method it defaults to meson even if CMakeLists.txt exists. -testcase expect_error('Subproject exists but has no meson.build file.') - subproject('cmake_subp') -endtestcase diff --git a/test cases/cmake/26 dependency fallback/subprojects/broken_method.wrap b/test cases/cmake/26 dependency fallback/subprojects/broken_method.wrap deleted file mode 100644 index ce0690a51..000000000 --- a/test cases/cmake/26 dependency fallback/subprojects/broken_method.wrap +++ /dev/null @@ -1,2 +0,0 @@ -[wrap-file] -method=notfound diff --git a/test cases/cmake/26 dependency fallback/subprojects/cmMod.wrap b/test cases/cmake/26 dependency fallback/subprojects/cmMod.wrap deleted file mode 100644 index 9e6d855f0..000000000 --- a/test cases/cmake/26 dependency fallback/subprojects/cmMod.wrap +++ /dev/null @@ -1,5 +0,0 @@ -[wrap-file] -method = cmake - -[provide] -cmModLib++ = cmModLib___dep diff --git a/test cases/cmake/26 dependency fallback/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/26 dependency fallback/subprojects/cmMod/CMakeLists.txt deleted file mode 100644 index d08e55cdf..000000000 --- a/test cases/cmake/26 dependency fallback/subprojects/cmMod/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -cmake_minimum_required(VERSION 3.5) - -project(cmMod) -set(CMAKE_CXX_STANDARD 14) - -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -add_definitions("-DDO_NOTHING_JUST_A_FLAG=1") - -add_library(cmModLib++ SHARED cmMod.cpp) -target_compile_definitions(cmModLib++ PRIVATE MESON_MAGIC_FLAG=21) -target_compile_definitions(cmModLib++ INTERFACE MESON_MAGIC_FLAG=42) - -# Test PCH support -if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0") - target_precompile_headers(cmModLib++ PRIVATE "cpp_pch.hpp") -endif() - -include(GenerateExportHeader) -generate_export_header(cmModLib++) diff --git a/test cases/cmake/26 dependency fallback/subprojects/cmMod/cmMod.cpp b/test cases/cmake/26 dependency fallback/subprojects/cmMod/cmMod.cpp deleted file mode 100644 index f4cbea0ce..000000000 --- a/test cases/cmake/26 dependency fallback/subprojects/cmMod/cmMod.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "cmMod.hpp" - -using namespace std; - -#if MESON_MAGIC_FLAG != 21 -#error "Invalid MESON_MAGIC_FLAG (private)" -#endif - -cmModClass::cmModClass(string foo) { - str = foo + " World"; -} - -string cmModClass::getStr() const { - return str; -} diff --git a/test cases/cmake/26 dependency fallback/subprojects/cmMod/cmMod.hpp b/test cases/cmake/26 dependency fallback/subprojects/cmMod/cmMod.hpp deleted file mode 100644 index 4445e1f53..000000000 --- a/test cases/cmake/26 dependency fallback/subprojects/cmMod/cmMod.hpp +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "cmmodlib++_export.h" -#include - -#if MESON_MAGIC_FLAG != 42 && MESON_MAGIC_FLAG != 21 -#error "Invalid MESON_MAGIC_FLAG" -#endif - -class CMMODLIB___EXPORT cmModClass { -private: - std::string str; - -public: - cmModClass(std::string foo); - - std::string getStr() const; -}; diff --git a/test cases/cmake/26 dependency fallback/subprojects/cmMod/cpp_pch.hpp b/test cases/cmake/26 dependency fallback/subprojects/cmMod/cpp_pch.hpp deleted file mode 100644 index aa7ceb361..000000000 --- a/test cases/cmake/26 dependency fallback/subprojects/cmMod/cpp_pch.hpp +++ /dev/null @@ -1,2 +0,0 @@ -#include -#include diff --git a/test cases/cmake/26 dependency fallback/subprojects/cmake_subp/CMakeLists.txt b/test cases/cmake/26 dependency fallback/subprojects/cmake_subp/CMakeLists.txt deleted file mode 100644 index 6443fcadd..000000000 --- a/test cases/cmake/26 dependency fallback/subprojects/cmake_subp/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(cmModDummy) diff --git a/test cases/cmake/26 dependency fallback/subprojects/force_cmake.wrap b/test cases/cmake/26 dependency fallback/subprojects/force_cmake.wrap deleted file mode 100644 index b24754eca..000000000 --- a/test cases/cmake/26 dependency fallback/subprojects/force_cmake.wrap +++ /dev/null @@ -1,2 +0,0 @@ -[wrap-file] -method=cmake diff --git a/test cases/cmake/26 dependency fallback/subprojects/force_cmake/CMakeLists.txt b/test cases/cmake/26 dependency fallback/subprojects/force_cmake/CMakeLists.txt deleted file mode 100644 index 497beb95e..000000000 --- a/test cases/cmake/26 dependency fallback/subprojects/force_cmake/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(cmModBoth) diff --git a/test cases/cmake/26 dependency fallback/subprojects/force_cmake/meson.build b/test cases/cmake/26 dependency fallback/subprojects/force_cmake/meson.build deleted file mode 100644 index 92649744e..000000000 --- a/test cases/cmake/26 dependency fallback/subprojects/force_cmake/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -project('both methods') - -# Ensure the meson method is not used. -notfound() diff --git a/test cases/cmake/26 dependency fallback/subprojects/meson_method.wrap b/test cases/cmake/26 dependency fallback/subprojects/meson_method.wrap deleted file mode 100644 index e52701e57..000000000 --- a/test cases/cmake/26 dependency fallback/subprojects/meson_method.wrap +++ /dev/null @@ -1,2 +0,0 @@ -[wrap-file] -method=meson diff --git a/test cases/cmake/26 dependency fallback/subprojects/meson_subp/meson.build b/test cases/cmake/26 dependency fallback/subprojects/meson_subp/meson.build deleted file mode 100644 index e4746ce6b..000000000 --- a/test cases/cmake/26 dependency fallback/subprojects/meson_subp/meson.build +++ /dev/null @@ -1 +0,0 @@ -project('dummy') diff --git a/test cases/cmake/27 dependency fallback/main.cpp b/test cases/cmake/27 dependency fallback/main.cpp new file mode 100644 index 000000000..95079615a --- /dev/null +++ b/test cases/cmake/27 dependency fallback/main.cpp @@ -0,0 +1,10 @@ +#include +#include + +using namespace std; + +int main(void) { + cmModClass obj("Hello"); + cout << obj.getStr() << endl; + return 0; +} diff --git a/test cases/cmake/27 dependency fallback/meson.build b/test cases/cmake/27 dependency fallback/meson.build new file mode 100644 index 000000000..871d70c9f --- /dev/null +++ b/test cases/cmake/27 dependency fallback/meson.build @@ -0,0 +1,30 @@ +project('cmakeSubTest', ['c', 'cpp']) + +# Fallback to a CMake subproject +sub_dep = dependency('cmModLib++') +exe1 = executable('main', ['main.cpp'], dependencies: [sub_dep]) +test('test1', exe1) + +# Subproject contains both meson.build and CMakeLists.txt. It should default +# to meson but wrap force cmake. +subproject('force_cmake') + +testcase expect_error('Wrap method \'notfound\' is not supported, must be one of: meson, cmake, cargo') + subproject('broken_method') +endtestcase + +# With method=meson we can't use cmake.subproject() +cmake = import('cmake') +testcase expect_error('Wrap method is \'meson\' but we are trying to configure it with cmake') + cmake.subproject('meson_method') +endtestcase + +# cmake.subproject() force cmake method even if meson.build exists. +testcase expect_error('Subproject exists but has no CMakeLists.txt file.') + cmake.subproject('meson_subp') +endtestcase + +# Without specifying the method it defaults to meson even if CMakeLists.txt exists. +testcase expect_error('Subproject exists but has no meson.build file.') + subproject('cmake_subp') +endtestcase diff --git a/test cases/cmake/27 dependency fallback/subprojects/broken_method.wrap b/test cases/cmake/27 dependency fallback/subprojects/broken_method.wrap new file mode 100644 index 000000000..ce0690a51 --- /dev/null +++ b/test cases/cmake/27 dependency fallback/subprojects/broken_method.wrap @@ -0,0 +1,2 @@ +[wrap-file] +method=notfound diff --git a/test cases/cmake/27 dependency fallback/subprojects/cmMod.wrap b/test cases/cmake/27 dependency fallback/subprojects/cmMod.wrap new file mode 100644 index 000000000..9e6d855f0 --- /dev/null +++ b/test cases/cmake/27 dependency fallback/subprojects/cmMod.wrap @@ -0,0 +1,5 @@ +[wrap-file] +method = cmake + +[provide] +cmModLib++ = cmModLib___dep diff --git a/test cases/cmake/27 dependency fallback/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/27 dependency fallback/subprojects/cmMod/CMakeLists.txt new file mode 100644 index 000000000..d08e55cdf --- /dev/null +++ b/test cases/cmake/27 dependency fallback/subprojects/cmMod/CMakeLists.txt @@ -0,0 +1,20 @@ +cmake_minimum_required(VERSION 3.5) + +project(cmMod) +set(CMAKE_CXX_STANDARD 14) + +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +add_definitions("-DDO_NOTHING_JUST_A_FLAG=1") + +add_library(cmModLib++ SHARED cmMod.cpp) +target_compile_definitions(cmModLib++ PRIVATE MESON_MAGIC_FLAG=21) +target_compile_definitions(cmModLib++ INTERFACE MESON_MAGIC_FLAG=42) + +# Test PCH support +if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0") + target_precompile_headers(cmModLib++ PRIVATE "cpp_pch.hpp") +endif() + +include(GenerateExportHeader) +generate_export_header(cmModLib++) diff --git a/test cases/cmake/27 dependency fallback/subprojects/cmMod/cmMod.cpp b/test cases/cmake/27 dependency fallback/subprojects/cmMod/cmMod.cpp new file mode 100644 index 000000000..f4cbea0ce --- /dev/null +++ b/test cases/cmake/27 dependency fallback/subprojects/cmMod/cmMod.cpp @@ -0,0 +1,15 @@ +#include "cmMod.hpp" + +using namespace std; + +#if MESON_MAGIC_FLAG != 21 +#error "Invalid MESON_MAGIC_FLAG (private)" +#endif + +cmModClass::cmModClass(string foo) { + str = foo + " World"; +} + +string cmModClass::getStr() const { + return str; +} diff --git a/test cases/cmake/27 dependency fallback/subprojects/cmMod/cmMod.hpp b/test cases/cmake/27 dependency fallback/subprojects/cmMod/cmMod.hpp new file mode 100644 index 000000000..4445e1f53 --- /dev/null +++ b/test cases/cmake/27 dependency fallback/subprojects/cmMod/cmMod.hpp @@ -0,0 +1,18 @@ +#pragma once + +#include "cmmodlib++_export.h" +#include + +#if MESON_MAGIC_FLAG != 42 && MESON_MAGIC_FLAG != 21 +#error "Invalid MESON_MAGIC_FLAG" +#endif + +class CMMODLIB___EXPORT cmModClass { +private: + std::string str; + +public: + cmModClass(std::string foo); + + std::string getStr() const; +}; diff --git a/test cases/cmake/27 dependency fallback/subprojects/cmMod/cpp_pch.hpp b/test cases/cmake/27 dependency fallback/subprojects/cmMod/cpp_pch.hpp new file mode 100644 index 000000000..aa7ceb361 --- /dev/null +++ b/test cases/cmake/27 dependency fallback/subprojects/cmMod/cpp_pch.hpp @@ -0,0 +1,2 @@ +#include +#include diff --git a/test cases/cmake/27 dependency fallback/subprojects/cmake_subp/CMakeLists.txt b/test cases/cmake/27 dependency fallback/subprojects/cmake_subp/CMakeLists.txt new file mode 100644 index 000000000..6443fcadd --- /dev/null +++ b/test cases/cmake/27 dependency fallback/subprojects/cmake_subp/CMakeLists.txt @@ -0,0 +1,2 @@ +cmake_minimum_required(VERSION 3.5) +project(cmModDummy) diff --git a/test cases/cmake/27 dependency fallback/subprojects/force_cmake.wrap b/test cases/cmake/27 dependency fallback/subprojects/force_cmake.wrap new file mode 100644 index 000000000..b24754eca --- /dev/null +++ b/test cases/cmake/27 dependency fallback/subprojects/force_cmake.wrap @@ -0,0 +1,2 @@ +[wrap-file] +method=cmake diff --git a/test cases/cmake/27 dependency fallback/subprojects/force_cmake/CMakeLists.txt b/test cases/cmake/27 dependency fallback/subprojects/force_cmake/CMakeLists.txt new file mode 100644 index 000000000..497beb95e --- /dev/null +++ b/test cases/cmake/27 dependency fallback/subprojects/force_cmake/CMakeLists.txt @@ -0,0 +1,2 @@ +cmake_minimum_required(VERSION 3.5) +project(cmModBoth) diff --git a/test cases/cmake/27 dependency fallback/subprojects/force_cmake/meson.build b/test cases/cmake/27 dependency fallback/subprojects/force_cmake/meson.build new file mode 100644 index 000000000..92649744e --- /dev/null +++ b/test cases/cmake/27 dependency fallback/subprojects/force_cmake/meson.build @@ -0,0 +1,4 @@ +project('both methods') + +# Ensure the meson method is not used. +notfound() diff --git a/test cases/cmake/27 dependency fallback/subprojects/meson_method.wrap b/test cases/cmake/27 dependency fallback/subprojects/meson_method.wrap new file mode 100644 index 000000000..e52701e57 --- /dev/null +++ b/test cases/cmake/27 dependency fallback/subprojects/meson_method.wrap @@ -0,0 +1,2 @@ +[wrap-file] +method=meson diff --git a/test cases/cmake/27 dependency fallback/subprojects/meson_subp/meson.build b/test cases/cmake/27 dependency fallback/subprojects/meson_subp/meson.build new file mode 100644 index 000000000..e4746ce6b --- /dev/null +++ b/test cases/cmake/27 dependency fallback/subprojects/meson_subp/meson.build @@ -0,0 +1 @@ +project('dummy') -- cgit v1.2.3