diff --git a/tutorial/creating_packages/build_method/ci_test_example.py b/tutorial/creating_packages/build_method/ci_test_example.py index 19db65f4..4285d52f 100644 --- a/tutorial/creating_packages/build_method/ci_test_example.py +++ b/tutorial/creating_packages/build_method/ci_test_example.py @@ -3,10 +3,10 @@ print("- Building and running tests in the build() method -") -out = run(f"conan create . --build=missing --build=hello*") +out = run(f"conan create . -s compiler.cppstd=17 --build=missing --build=hello*") assert "Running 1 test from 1 test suite." in out -out = run(f"conan create . --build=missing --build=hello* -c tools.build:skip_test=True") +out = run(f"conan create . -s compiler.cppstd=17 --build=missing --build=hello* -c tools.build:skip_test=True") assert "Running 1 test from 1 test suite." not in out diff --git a/tutorial/creating_packages/build_method/conanfile.py b/tutorial/creating_packages/build_method/conanfile.py index 3e6f626d..430726fc 100644 --- a/tutorial/creating_packages/build_method/conanfile.py +++ b/tutorial/creating_packages/build_method/conanfile.py @@ -52,7 +52,9 @@ def source(self): def requirements(self): if self.options.with_fmt: self.requires("fmt/8.1.1") - self.test_requires("gtest/1.11.0") + + def build_requirements(self): + self.test_requires("gtest/1.17.0") def layout(self): cmake_layout(self) diff --git a/tutorial/creating_packages/other_packages/header_only_gtest/ci_test_example.py b/tutorial/creating_packages/other_packages/header_only_gtest/ci_test_example.py index 491d4438..2be3c263 100644 --- a/tutorial/creating_packages/other_packages/header_only_gtest/ci_test_example.py +++ b/tutorial/creating_packages/other_packages/header_only_gtest/ci_test_example.py @@ -2,7 +2,7 @@ from test.examples_tools import run -cmd_out = run("conan create . -s compiler.cppstd=14 --build missing") +cmd_out = run("conan create . -s compiler.cppstd=17 --build missing") assert "[ PASSED ] 1 test." in cmd_out assert "sum/0.1: Package 'da39a3ee5e6b4b0d3255bfef95601890afd80709' built" diff --git a/tutorial/creating_packages/other_packages/header_only_gtest/conanfile.py b/tutorial/creating_packages/other_packages/header_only_gtest/conanfile.py index 9ed801ec..0e31859e 100644 --- a/tutorial/creating_packages/other_packages/header_only_gtest/conanfile.py +++ b/tutorial/creating_packages/other_packages/header_only_gtest/conanfile.py @@ -18,8 +18,8 @@ class SumConan(ConanFile): def validate(self): check_min_cppstd(self, 11) - def requirements(self): - self.test_requires("gtest/1.11.0") + def build_requirements(self): + self.test_requires("gtest/1.17.0") def layout(self): cmake_layout(self) diff --git a/tutorial/creating_packages/package_information/ci_test_example.py b/tutorial/creating_packages/package_information/ci_test_example.py index a54ae66d..a74e98e5 100644 --- a/tutorial/creating_packages/package_information/ci_test_example.py +++ b/tutorial/creating_packages/package_information/ci_test_example.py @@ -5,7 +5,7 @@ print("- Define information for consumers depending on settings or options -") -out = run(f"conan create . --build=missing") +out = run(f"conan create . --build=missing -s compiler.cppstd=17") assertion = "Packaged 1 '.lib' file: hello-static.lib" if platform.system()=="Windows" else "Packaged 1 '.a' file: libhello-static.a" @@ -19,6 +19,6 @@ os.rename(os.path.join("test_package", "CMakeLists.txt"), os.path.join("test_package", "CMakeLists_.txt")) os.rename(os.path.join("test_package", "CMakeLists_properties.txt"), os.path.join("test_package", "CMakeLists.txt")) -out = run(f"conan create . --build=missing") +out = run(f"conan create . --build=missing -s compiler.cppstd=17") assert "Target declared 'hello::myhello'" in out diff --git a/tutorial/creating_packages/package_information/conanfile.py b/tutorial/creating_packages/package_information/conanfile.py index c5b6dbe7..aeac4f8a 100644 --- a/tutorial/creating_packages/package_information/conanfile.py +++ b/tutorial/creating_packages/package_information/conanfile.py @@ -52,7 +52,9 @@ def source(self): def requirements(self): if self.options.with_fmt: self.requires("fmt/8.1.1") - self.test_requires("gtest/1.11.0") + + def build_requirements(self): + self.test_requires("gtest/1.17.0") def layout(self): cmake_layout(self) diff --git a/tutorial/creating_packages/package_information/conanfile_properties.py b/tutorial/creating_packages/package_information/conanfile_properties.py index 9d65cd50..7b77b295 100644 --- a/tutorial/creating_packages/package_information/conanfile_properties.py +++ b/tutorial/creating_packages/package_information/conanfile_properties.py @@ -52,7 +52,9 @@ def source(self): def requirements(self): if self.options.with_fmt: self.requires("fmt/8.1.1") - self.test_requires("gtest/1.11.0") + + def build_requirements(self): + self.test_requires("gtest/1.17.0") def layout(self): cmake_layout(self) diff --git a/tutorial/creating_packages/package_method/ci_test_example.py b/tutorial/creating_packages/package_method/ci_test_example.py index 13350453..159edeaf 100644 --- a/tutorial/creating_packages/package_method/ci_test_example.py +++ b/tutorial/creating_packages/package_method/ci_test_example.py @@ -3,8 +3,8 @@ print("- Package method with cmake.install() -") -out = run(f"conan create . --build=missing") +out = run(f"conan create . --build=missing -s compiler.cppstd=17") print("- Package method with copy() -") -out = run(f"conan create manual_install.py --build=missing") +out = run(f"conan create manual_install.py -s compiler.cppstd=17 --build=missing") diff --git a/tutorial/creating_packages/package_method/conanfile.py b/tutorial/creating_packages/package_method/conanfile.py index 3e6f626d..430726fc 100644 --- a/tutorial/creating_packages/package_method/conanfile.py +++ b/tutorial/creating_packages/package_method/conanfile.py @@ -52,7 +52,9 @@ def source(self): def requirements(self): if self.options.with_fmt: self.requires("fmt/8.1.1") - self.test_requires("gtest/1.11.0") + + def build_requirements(self): + self.test_requires("gtest/1.17.0") def layout(self): cmake_layout(self) diff --git a/tutorial/creating_packages/package_method/manual_install.py b/tutorial/creating_packages/package_method/manual_install.py index f5ccbb46..93f24731 100644 --- a/tutorial/creating_packages/package_method/manual_install.py +++ b/tutorial/creating_packages/package_method/manual_install.py @@ -53,7 +53,9 @@ def source(self): def requirements(self): if self.options.with_fmt: self.requires("fmt/8.1.1") - self.test_requires("gtest/1.11.0") + + def build_requirements(self): + self.test_requires("gtest/1.17.0") def layout(self): cmake_layout(self) diff --git a/tutorial/creating_packages/testing_packages/conanfile.py b/tutorial/creating_packages/testing_packages/conanfile.py index 3e6f626d..430726fc 100644 --- a/tutorial/creating_packages/testing_packages/conanfile.py +++ b/tutorial/creating_packages/testing_packages/conanfile.py @@ -52,7 +52,9 @@ def source(self): def requirements(self): if self.options.with_fmt: self.requires("fmt/8.1.1") - self.test_requires("gtest/1.11.0") + + def build_requirements(self): + self.test_requires("gtest/1.17.0") def layout(self): cmake_layout(self)