[Lldb-commits] [lldb] r367291 - [lldb] [test/lldb-vscode] Use realpath to match vscode behavior

Michal Gorny via lldb-commits lldb-commits at lists.llvm.org
Tue Jul 30 00:47:23 PDT 2019


Author: mgorny
Date: Tue Jul 30 00:47:22 2019
New Revision: 367291

URL: http://llvm.org/viewvc/llvm-project?rev=367291&view=rev
Log:
[lldb] [test/lldb-vscode] Use realpath to match vscode behavior

Compare the directory paths returned by lldb-vscode against realpaths
rather than apparent paths.  This matches lldb-vscode behavior
and therefore fixes test failures when one of the parent directories
of the source tree is a symlink.

Differential Revision: https://reviews.llvm.org/D65432

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/TestVSCode_launch.py

Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/TestVSCode_launch.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/TestVSCode_launch.py?rev=367291&r1=367290&r2=367291&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/TestVSCode_launch.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/TestVSCode_launch.py Tue Jul 30 00:47:22 2019
@@ -68,7 +68,8 @@ class TestVSCode_launch(lldbvscode_testc
             directory.
         '''
         program = self.getBuildArtifact("a.out")
-        program_parent_dir = os.path.dirname(os.path.dirname(program))
+        program_parent_dir = os.path.realpath(
+            os.path.dirname(os.path.dirname(program)))
         self.build_and_launch(program,
                               cwd=program_parent_dir)
         self.continue_to_exit()
@@ -96,7 +97,8 @@ class TestVSCode_launch(lldbvscode_testc
             the lldb-vscode debug adaptor.
         '''
         program = self.getBuildArtifact("a.out")
-        program_parent_dir = os.path.dirname(os.path.dirname(program))
+        program_parent_dir = os.path.realpath(
+            os.path.dirname(os.path.dirname(program)))
         commands = ['platform shell echo cwd = $PWD']
         self.build_and_launch(program,
                               debuggerRoot=program_parent_dir,




More information about the lldb-commits mailing list