[PATCH] D62005: [libunwind] [test] Fix inferring source paths

[Michał Górny via Phabricator via cfe-commits]

This revision was automatically updated to reflect the committed changes.
mgorny marked an inline comment as done.
Closed by commit rL361931: [libunwind] [test] Fix inferring source paths (authored by mgorny, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Changed prior to commit:
  https://reviews.llvm.org/D62005?vs=199799&id=201834#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D62005/new/

https://reviews.llvm.org/D62005

Files:
  libunwind/trunk/test/libunwind/test/config.py


Index: libunwind/trunk/test/libunwind/test/config.py
===================================================================
--- libunwind/trunk/test/libunwind/test/config.py
+++ libunwind/trunk/test/libunwind/test/config.py
@@ -21,12 +21,10 @@
         self.libcxx_src_root = None
 
     def configure_src_root(self):
-        self.libunwind_src_root = self.get_lit_conf(
-            'libunwind_src_root',
-            os.path.dirname(self.config.test_source_root))
-        self.libcxx_src_root = self.get_lit_conf(
-            'libcxx_src_root',
-            os.path.join(self.libunwind_src_root, '/../libcxx'))
+        self.libunwind_src_root = (self.get_lit_conf('libunwind_src_root')
+            or os.path.dirname(self.config.test_source_root))
+        self.libcxx_src_root = (self.get_lit_conf('libcxx_src_root')
+            or os.path.join(self.libunwind_src_root, '..', 'libcxx'))
 
     def configure_obj_root(self):
         self.libunwind_obj_root = self.get_lit_conf('libunwind_obj_root')


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D62005.201834.patch
Type: text/x-patch
Size: 1005 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20190529/e250ae7d/attachment-0001.bin>