From 5b27f9c03abe17bc2e91bb04aced17736d01b7a7 Mon Sep 17 00:00:00 2001 From: System-Arch <33330183+System-Arch@users.noreply.github.com> Date: Tue, 7 Feb 2023 21:42:31 -0500 Subject: [PATCH] Jump through more hoops to make tests work with Conan 1.x --- recipes/autoconf-archive/all/test_package/conanfile.py | 5 +---- recipes/autoconf-archive/all/test_v1_package/conanfile.py | 7 +++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes/autoconf-archive/all/test_package/conanfile.py b/recipes/autoconf-archive/all/test_package/conanfile.py index f22aa286d675b..737285d3778bc 100644 --- a/recipes/autoconf-archive/all/test_package/conanfile.py +++ b/recipes/autoconf-archive/all/test_package/conanfile.py @@ -3,7 +3,6 @@ from conan.tools.gnu import AutotoolsToolchain, Autotools from conan.tools.microsoft import is_msvc, unix_path from conan.tools.layout import basic_layout -from conan.tools.env import VirtualBuildEnv import os import shutil @@ -14,6 +13,7 @@ class TestPackageConan(ConanFile): settings = "os", "arch", "compiler", "build_type" exports_sources = "configure.ac", "Makefile.am", "test_package.c" test_type = "explicit" + generators = "VirtualBuildEnv" # Need VirtualBuildEnv for Conan 1.x env_info support win_bash = True # This assignment must be *here* to avoid "Cannot wrap command with different envs." in Conan 1.x @property @@ -39,9 +39,6 @@ def generate(self): env.define("CC", "cl -nologo") env.define("CXX", "cl -nologo") tc.generate(env) - # Need VirtualBuildEnv for Conan 1.x env_info support - env = VirtualBuildEnv(self) - env.generate() def build(self): if not cross_building(self): diff --git a/recipes/autoconf-archive/all/test_v1_package/conanfile.py b/recipes/autoconf-archive/all/test_v1_package/conanfile.py index 60c31e6e36022..99631c75c0149 100644 --- a/recipes/autoconf-archive/all/test_v1_package/conanfile.py +++ b/recipes/autoconf-archive/all/test_v1_package/conanfile.py @@ -3,7 +3,7 @@ import os import shutil -required_conan_version = ">=1.36.0" +required_conan_version = ">=1.56.0" class TestPackageConan(ConanFile): @@ -37,7 +37,10 @@ def _build_context(self): def build(self): for src in self.exports_sources: shutil.copy(os.path.join(self.source_folder, src), self.build_folder) - self.run("{} -fiv".format(tools.get_env("AUTORECONF")), run_environment=True, win_bash=self._settings_build.os == "Windows") + + # Work around the fact that "used_special_vars" in conans/client/tools/win.py doesn't handle ACLOCAL_PATH + aclocal_path = "$ACLOCAL_PATH:" + self.deps_env_info.vars["ACLOCAL_PATH"][0].lower() + self.run("ACLOCAL_PATH={} autoreconf -fiv".format(aclocal_path), win_bash=self._settings_build.os == "Windows") with self._build_context(): autotools = AutoToolsBuildEnvironment(self, win_bash=self._settings_build.os == "Windows") autotools.libs = []