From b974f818044a3211bf9623c3dd60f88482786164 Mon Sep 17 00:00:00 2001 From: geir-t <35292136+geir-t@users.noreply.github.com> Date: Mon, 17 Feb 2020 15:02:45 +0100 Subject: [PATCH] conan: Do not run tests when cross compiling (#430) --- conanfile.py | 5 +++-- test_package/conanfile.py | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/conanfile.py b/conanfile.py index 6ce8a01..377cd01 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,5 +1,5 @@ from conans import ConanFile, CMake -from conans.tools import load +from conans.tools import load, cross_building import re @@ -40,7 +40,8 @@ class CLI11Conan(ConanFile): cmake.definitions["CLI11_SINGLE_FILE"] = "OFF" cmake.configure() cmake.build() - cmake.test() + if not cross_building(self.settings): + cmake.test() cmake.install() def package_id(self): diff --git a/test_package/conanfile.py b/test_package/conanfile.py index 91b91dd..4c5c028 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -1,4 +1,4 @@ -from conans import ConanFile, CMake +from conans import ConanFile, CMake, tools import os @@ -16,5 +16,6 @@ class HelloTestConan(ConanFile): self.copy("*.dylib*", dst="bin", src="lib") def test(self): - os.chdir("bin") - self.run(".%sexample" % os.sep) + if not tools.cross_building(self.settings): + os.chdir("bin") + self.run(".%sexample" % os.sep) -- libgit2 0.21.4