Skip to content

Commit

Permalink
[llvm-config] Make tests more resiliant
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
llvm-beanz committed Oct 18, 2022
1 parent 933e7e2 commit a4b0100
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion llvm/test/tools/llvm-config/booleans.test
Expand Up @@ -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
2 changes: 1 addition & 1 deletion 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
Expand Down

0 comments on commit a4b0100

Please sign in to comment.