vendor/lldb/lldb-trunk-r338150

2 files changed, 5 insertions, 3 deletions

diff --git a/packages/Python/lldbsuite/test/functionalities/frame-language/Makefile b/packages/Python/lldbsuite/test/functionalities/frame-language/Makefile
index 089fc237b054..cb1af719ac35 100644
--- a/packages/Python/lldbsuite/test/functionalities/frame-language/Makefile
+++ b/packages/Python/lldbsuite/test/functionalities/frame-language/Makefile
@@ -6,7 +6,7 @@ C_SOURCES := somefunc.c
 include $(LEVEL)/Makefile.rules
 
 other-2.o: other-2.cpp
-	$(CXX) $(CFLAGS_NO_DEBUG) -c other-2.cpp
+	$(CXX) $(CFLAGS_NO_DEBUG) -c $(SRCDIR)/other-2.cpp
 
 somefunc.o: somefunc.c
-	$(CC) $(CFLAGS) -std=c99 -c somefunc.c
\ No newline at end of file
+	$(CC) $(CFLAGS) -std=c99 -c $(SRCDIR)/somefunc.c
diff --git a/packages/Python/lldbsuite/test/functionalities/frame-language/TestGuessLanguage.py b/packages/Python/lldbsuite/test/functionalities/frame-language/TestGuessLanguage.py
index 178e165f3cbe..59af2de836ff 100644
--- a/packages/Python/lldbsuite/test/functionalities/frame-language/TestGuessLanguage.py
+++ b/packages/Python/lldbsuite/test/functionalities/frame-language/TestGuessLanguage.py
@@ -10,6 +10,7 @@ import time
 import re
 import lldb
 import lldbsuite.test.lldbutil as lldbutil
+from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 
 
@@ -22,6 +23,7 @@ class TestFrameGuessLanguage(TestBase):
     # each debug info format.
     NO_DEBUG_INFO_TESTCASE = True
 
+    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr37658")
     def test_guess_language(self):
         """Test GuessLanguage for C and C++."""
         self.build()
@@ -39,7 +41,7 @@ class TestFrameGuessLanguage(TestBase):
 
     def do_test(self):
         """Test GuessLanguage for C & C++."""
-        exe = os.path.join(os.getcwd(), "a.out")
+        exe = self.getBuildArtifact("a.out")
 
         # Create a target by the debugger.
         target = self.dbg.CreateTarget(exe)