diff options
| author | Hans Wennborg <hans@hanshq.net> | 2018-03-20 10:14:31 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2018-03-20 10:14:31 +0000 |
| commit | c6b5f3833ed0badd7959aaa98fa3530d0618a82b (patch) | |
| tree | 7ffeeb65739dfa7a107bf669d09dc06f57eab19f /lld/test | |
| parent | 21afff0ac9a458440871d7f93f91ac26d4765fa0 (diff) | |
| download | bcm5719-llvm-c6b5f3833ed0badd7959aaa98fa3530d0618a82b.tar.gz bcm5719-llvm-c6b5f3833ed0badd7959aaa98fa3530d0618a82b.zip | |
lit: Make config.llvm_libxml2_enabled an int, not a string
@LLVM_LIBXML2_ENABLED@ will be replaced with 0 or 1. Putting quotes
around that is unnecessary and just makes it harder to use the value.
This matches what have_zlib does below.
This also puts the flag together with the feature-related ones instead
of the path-related flags.
llvm-svn: 327964
Diffstat (limited to 'lld/test')
| -rw-r--r-- | lld/test/lit.cfg.py | 6 | ||||
| -rw-r--r-- | lld/test/lit.site.cfg.py.in | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lld/test/lit.cfg.py b/lld/test/lit.cfg.py index 05ebc23869a..a1c8910dc64 100644 --- a/lld/test/lit.cfg.py +++ b/lld/test/lit.cfg.py @@ -78,11 +78,11 @@ config.environment['LLD_IN_TEST'] = '1' # Indirectly check if the mt.exe Microsoft utility exists by searching for # cvtres, which always accompanies it. Alternatively, check if we can use # libxml2 to merge manifests. -if (lit.util.which('cvtres', config.environment['PATH'])) or \ - (config.llvm_libxml2_enabled == '1'): +if lit.util.which('cvtres', config.environment['PATH']) or \ + config.llvm_libxml2_enabled: config.available_features.add('manifest_tool') -if (config.llvm_libxml2_enabled == '1'): +if config.llvm_libxml2_enabled: config.available_features.add('libxml2') tar_executable = lit.util.which('tar', config.environment['PATH']) diff --git a/lld/test/lit.site.cfg.py.in b/lld/test/lit.site.cfg.py.in index 50593f7d01b..305d5870681 100644 --- a/lld/test/lit.site.cfg.py.in +++ b/lld/test/lit.site.cfg.py.in @@ -4,7 +4,6 @@ config.llvm_src_root = "@LLVM_SOURCE_DIR@" config.llvm_obj_root = "@LLVM_BINARY_DIR@" config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" config.llvm_libs_dir = "@LLVM_LIBS_DIR@" -config.llvm_libxml2_enabled = "@LLVM_LIBXML2_ENABLED@" config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" config.lld_obj_root = "@LLD_BINARY_DIR@" config.lld_libs_dir = "@LLVM_LIBRARY_OUTPUT_INTDIR@" @@ -12,6 +11,7 @@ config.lld_tools_dir = "@LLVM_RUNTIME_OUTPUT_INTDIR@" config.target_triple = "@TARGET_TRIPLE@" config.python_executable = "@PYTHON_EXECUTABLE@" config.have_zlib = @HAVE_LIBZ@ +config.llvm_libxml2_enabled = @LLVM_LIBXML2_ENABLED@ # Support substitution of the tools and libs dirs with user parameters. This is # used when we can't determine the tool dir at configuration time. |
