From a4b010034f57b428acb3a57a767366eb40816173 Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Tue, 18 Oct 2022 09:50:24 -0500 Subject: [PATCH] [llvm-config] Make tests more resiliant In some modes llvm-config issues an error if a requested library is not available on the system. The in-tree lit tests do not add explicit dependencies on all component libraries, instead relying on the transitive dependencies of tools and other libraries. This can result in some configurations where a component library may not be used by any of the test dependencies, so it may not be generated before the tests run. This occurs when optional components of the LLVM build are excluded, or not included. In the case where a component library is not generated two test caess are currently failing. One which tests the shared library boolean flag, and one which tests the system library requirements. Neither test require the full set of LLVM libraries to be specifed, so in both cases I've limited the requested library set to Support to make the tests more robust. --- llvm/test/tools/llvm-config/booleans.test | 2 +- llvm/test/tools/llvm-config/system-libs.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm/test/tools/llvm-config/booleans.test b/llvm/test/tools/llvm-config/booleans.test index 6483db5..c186374a 100644 --- a/llvm/test/tools/llvm-config/booleans.test +++ b/llvm/test/tools/llvm-config/booleans.test @@ -21,7 +21,7 @@ CHECK-BUILD-SYSTEM: {{cmake|gn}} CHECK-BUILD-SYSTEM-NOT: error: CHECK-BUILD-SYSTEM-NOT: warning -RUN: llvm-config --shared-mode 2>&1 | FileCheck --check-prefix=CHECK-SHARED-MODE %s +RUN: llvm-config --shared-mode 2>&1 Support | FileCheck --check-prefix=CHECK-SHARED-MODE %s CHECK-SHARED-MODE: {{static|shared}} CHECK-SHARED-MODE-NOT: error: CHECK-SHARED-MODE-NOT: warning diff --git a/llvm/test/tools/llvm-config/system-libs.test b/llvm/test/tools/llvm-config/system-libs.test index 9105d24..708ce3e 100644 --- a/llvm/test/tools/llvm-config/system-libs.test +++ b/llvm/test/tools/llvm-config/system-libs.test @@ -1,4 +1,4 @@ -RUN: llvm-config --link-static --system-libs 2>&1 | FileCheck %s +RUN: llvm-config --link-static --system-libs Support 2>&1 | FileCheck %s REQUIRES: static-libs UNSUPPORTED: system-windows CHECK: -l -- 2.7.4