Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tutorial/creating_packages/build_method/ci_test_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 3 additions & 1 deletion tutorial/creating_packages/build_method/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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
4 changes: 3 additions & 1 deletion tutorial/creating_packages/package_information/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions tutorial/creating_packages/package_method/ci_test_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
4 changes: 3 additions & 1 deletion tutorial/creating_packages/package_method/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion tutorial/creating_packages/package_method/manual_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion tutorial/creating_packages/testing_packages/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down