From 577fc0845718ed8ad5bebf02a277c0579a817f77 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Fri, 17 May 2024 17:58:38 +0200 Subject: wanda: restructure source layout --- test_package/conanfile.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'test_package/conanfile.py') diff --git a/test_package/conanfile.py b/test_package/conanfile.py index 6077dcb..403e357 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -13,9 +13,6 @@ class WandaTestConan(ConanFile): self.requires(self.tested_reference_str) def build(self): - if self._apps_only: - return - cmake = CMake(self) cmake.configure() cmake.build() @@ -27,13 +24,7 @@ class WandaTestConan(ConanFile): if not can_run(self): return - if self._apps_only: - self.run("wandad -h", env="conanrun") - self.run("wandac -h", env="conanrun") - else: - cmd = os.path.join(self.cpp.build.bindir, "test") - self.run(cmd, env="conanrun") - - @property - def _apps_only(self): - return self.dependencies[self.tested_reference_str].options.nolibs + self.run("wandad -h", env="conanrun") + self.run("wandac -h", env="conanrun") + cmd = os.path.join(self.cpp.build.bindir, "test") + self.run(cmd, env="conanrun") -- cgit v1.2.3