Merge pull request #5 from bincrafters/testing/8.41

Testing/8.41

conanfile.py

@@ -68,6 +68,8 @@ def configure_cmake(self):
  cmake.definitions["PCRE_BUILD_PCRECPP"] = self.options.build_pcrecpp
  cmake.definitions["PCRE_SUPPORT_LIBZ"] = self.options.with_zlib
  cmake.definitions["PCRE_SUPPORT_LIBBZ2"] = self.options.with_bzip2
+ cmake.definitions["PCRE_SUPPORT_LIBREADLINE"] = False
+ cmake.definitions["PCRE_SUPPORT_LIBEDIT"] = False
  if self.settings.os == "Windows" and self.settings.compiler == "Visual Studio":
  cmake.definitions["PCRE_STATIC_RUNTIME"] = not self.options.shared and "MT" in self.settings.compiler.runtime
  cmake.configure(build_folder=self.build_subfolder)

test_package/conanfile.py

@@ -18,12 +18,13 @@ def build(self):
  cmake.build()
 
  def test(self):
- with tools.environment_append(RunEnvironment(self).vars):
- bin_path = os.path.join("bin", "test_package")
- arguments = "%sw+ Bincrafters" % ("\\" if self.settings.os == "Windows" else "\\\\")
- if self.settings.os == "Windows":
- self.run("%s %s" % (bin_path, arguments))
- elif self.settings.os == "Macos":
- self.run("DYLD_LIBRARY_PATH=%s %s %s" % (os.environ.get('DYLD_LIBRARY_PATH', ''), bin_path, arguments))
- else:
- self.run("LD_LIBRARY_PATH=%s %s %s" % (os.environ.get('LD_LIBRARY_PATH', ''), bin_path, arguments))
+ if not tools.cross_building(self.settings):
+ with tools.environment_append(RunEnvironment(self).vars):
+ bin_path = os.path.join("bin", "test_package")
+ arguments = "%sw+ Bincrafters" % ("\\" if self.settings.os == "Windows" else "\\\\")
+ if self.settings.os == "Windows":
+ self.run("%s %s" % (bin_path, arguments))
+ elif self.settings.os == "Macos":
+ self.run("DYLD_LIBRARY_PATH=%s %s %s" % (os.environ.get('DYLD_LIBRARY_PATH', ''), bin_path, arguments))
+ else:
+ self.run("LD_LIBRARY_PATH=%s %s %s" % (os.environ.get('LD_LIBRARY_PATH', ''), bin_path, arguments))