[PATCH] D65674: [lit] Fix 42812: lit test suite can no longer be run stand-alone

[Stella Stamenova via Phabricator via llvm-commits]

stella.stamenova created this revision.
stella.stamenova added reviewers: probinson, mgorny.
Herald added subscribers: llvm-commits, delcypher.
Herald added a project: LLVM.

This change updates the lit.cfg file to use llvm_config when it is available, but when it is not, it directly modifies the config object. This makes it possible to run the lit tests standalone without having built llvm (as long as the correct binaries are present in the path such as FileCheck and not).

Because the lit tests don't take a hard dependency on llvm_config, some features such as system-windows have to have definitions in lit's cfg file as well. This is a potential issue as the os features sometimes change names (for example, we went from windows to system-windows, etc.). This can cause drift between lit's tests and the rest of the llvm tests.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D65674

Files:
  llvm/utils/lit/tests/lit.cfg


Index: llvm/utils/lit/tests/lit.cfg
===================================================================
--- llvm/utils/lit/tests/lit.cfg
+++ llvm/utils/lit/tests/lit.cfg
@@ -36,9 +36,13 @@
   lit_path = os.path.join(config.test_source_root, '..')
 
 # Required because some tests import the lit module
-llvm_config.with_environment('PYTHONPATH', lit_path, append_path=True)
+if llvm_config:
+  llvm_config.with_environment('PYTHONPATH', lit_path, append_path=True)
+else:
+  config.environment['PYTHONPATH'] = os.pathsep.join([lit_path])
 
 # Add llvm and lit tools directories if this config is being loaded indirectly.
+# In this case, we can also expect llvm_config to have been imported correctly.
 for attribute in ('llvm_tools_dir', 'lit_tools_dir'):
     directory = getattr(config, attribute, None)
     if directory:
@@ -71,3 +75,10 @@
     lit_config.warning('Setting a timeout per test not supported. ' + errormsg
                        + ' Some tests will be skipped and the --timeout'
                          ' command line argument will not work.')
+
+# When running the lit tests standalone, we want to define the same features
+# that the llvm_config defines. This means that the 'system-windows' feature
+# (and any others) need to match the names in llvm_config for consistency
+if not llvm_config:
+  if sys.platform.startswith('win') or sys.platform.startswith('cygwin'):
+    config.available_features.add('system-windows')


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D65674.213118.patch
Type: text/x-patch
Size: 1448 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190802/fdd59770/attachment.bin>