From f5b5325a10ac5a228995851ae4335dfaa907d2a7 Mon Sep 17 00:00:00 2001 From: Stella Stamenova Date: Tue, 18 Dec 2018 22:54:17 +0000 Subject: [PATCH] [lit] Use the new build.py script in the lldb-mi tests This allows the tests to pass on Windows as well llvm-svn: 349562 --- lldb/lit/Driver/Inputs/hello.c | 5 +++-- lldb/lit/Driver/TestConvenienceVariables.test | 4 ++-- lldb/lit/tools/lldb-mi/breakpoint/break-insert.test | 5 +---- lldb/lit/tools/lldb-mi/data/data-info-line.test | 5 +---- lldb/lit/tools/lldb-mi/exec/exec-continue.test | 5 +---- lldb/lit/tools/lldb-mi/exec/exec-finish.test | 5 +---- lldb/lit/tools/lldb-mi/exec/exec-interrupt.test | 5 +---- lldb/lit/tools/lldb-mi/exec/exec-next-instruction.test | 5 +---- lldb/lit/tools/lldb-mi/exec/exec-next.test | 5 +---- lldb/lit/tools/lldb-mi/exec/exec-step-instruction.test | 5 +---- lldb/lit/tools/lldb-mi/exec/exec-step.test | 5 +---- lldb/lit/tools/lldb-mi/symbol/symbol-list-lines.test | 5 +---- .../breakpoint/breakpoint_command/TestBreakpointCommand.py | 2 -- 13 files changed, 15 insertions(+), 46 deletions(-) diff --git a/lldb/lit/Driver/Inputs/hello.c b/lldb/lit/Driver/Inputs/hello.c index fb9be9a12675..60d6f7587fdc 100644 --- a/lldb/lit/Driver/Inputs/hello.c +++ b/lldb/lit/Driver/Inputs/hello.c @@ -1,5 +1,6 @@ -int puts(const char*); +#include + int main(int argc, char **argv) { - puts("Hello World\n"); + printf("Hello World\n"); return 0; } diff --git a/lldb/lit/Driver/TestConvenienceVariables.test b/lldb/lit/Driver/TestConvenienceVariables.test index ea0931fdf788..eac57af3a3df 100644 --- a/lldb/lit/Driver/TestConvenienceVariables.test +++ b/lldb/lit/Driver/TestConvenienceVariables.test @@ -1,4 +1,4 @@ -RUN: %clang %p/Inputs/hello.c -g -o %t +RUN: %build %p/Inputs/hello.c -o %t RUN: %lldb %t -s %p/Inputs/convenience.in -o quit | FileCheck %s script print(lldb.debugger) @@ -15,7 +15,7 @@ CHECK-SAME: executable = TestConvenienceVariables.test CHECK: script print(lldb.thread.GetStopDescription(100)) CHECK: breakpoint 1.1 CHECK: script lldb.frame.GetLineEntry().GetLine() -CHECK: 3 +CHECK: 4 CHECK: script lldb.frame.GetLineEntry().GetFileSpec().GetFilename() CHECK: hello.c CHECK: script lldb.frame.GetFunctionName() diff --git a/lldb/lit/tools/lldb-mi/breakpoint/break-insert.test b/lldb/lit/tools/lldb-mi/breakpoint/break-insert.test index 74ce04e4a1b7..ef50bf530077 100644 --- a/lldb/lit/tools/lldb-mi/breakpoint/break-insert.test +++ b/lldb/lit/tools/lldb-mi/breakpoint/break-insert.test @@ -1,7 +1,4 @@ -# XFAIL: system-windows -# -> llvm.org/pr24452 -# -# RUN: %clang -o a.exe %p/inputs/break-insert.c -g +# RUN: %build %p/inputs/break-insert.c --nodefaultlib -o a.exe # RUN: %lldbmi < %s | FileCheck %s # Test that a breakpoint can be inserted before creating a target. diff --git a/lldb/lit/tools/lldb-mi/data/data-info-line.test b/lldb/lit/tools/lldb-mi/data/data-info-line.test index a42305d19a2b..287e833ab9ef 100644 --- a/lldb/lit/tools/lldb-mi/data/data-info-line.test +++ b/lldb/lit/tools/lldb-mi/data/data-info-line.test @@ -1,7 +1,4 @@ -# XFAIL: system-windows -# -> llvm.org/pr24452 -# -# RUN: %clang -o %t %p/inputs/data-info-line.c -g +# RUN: %build %p/inputs/data-info-line.c --nodefaultlib -o %t # RUN: %lldbmi %t < %s | FileCheck %s # Test lldb-mi -data-info-line command. diff --git a/lldb/lit/tools/lldb-mi/exec/exec-continue.test b/lldb/lit/tools/lldb-mi/exec/exec-continue.test index e9aba78bd670..d51393e5c716 100644 --- a/lldb/lit/tools/lldb-mi/exec/exec-continue.test +++ b/lldb/lit/tools/lldb-mi/exec/exec-continue.test @@ -1,7 +1,4 @@ -# XFAIL: system-windows -# -> llvm.org/pr24452 -# -# RUN: %clang -o %t %p/inputs/main.c -g +# RUN: %build %p/inputs/main.c --nodefaultlib -o %t # RUN: %lldbmi %t < %s | FileCheck %s # Test lldb-mi -exec-continue command. diff --git a/lldb/lit/tools/lldb-mi/exec/exec-finish.test b/lldb/lit/tools/lldb-mi/exec/exec-finish.test index 07ca95102d12..b2a50c5267fd 100644 --- a/lldb/lit/tools/lldb-mi/exec/exec-finish.test +++ b/lldb/lit/tools/lldb-mi/exec/exec-finish.test @@ -1,7 +1,4 @@ -# XFAIL: system-windows -# -> llvm.org/pr24452 -# -# RUN: %clang -o %t %p/inputs/main.c -g +# RUN: %build %p/inputs/main.c -o %t # RUN: %lldbmi %t < %s | FileCheck %s # Test lldb-mi -exec-finish command. diff --git a/lldb/lit/tools/lldb-mi/exec/exec-interrupt.test b/lldb/lit/tools/lldb-mi/exec/exec-interrupt.test index 43b5aa9be3fa..2c063236d7f5 100644 --- a/lldb/lit/tools/lldb-mi/exec/exec-interrupt.test +++ b/lldb/lit/tools/lldb-mi/exec/exec-interrupt.test @@ -1,7 +1,4 @@ -# XFAIL: system-windows -# -> llvm.org/pr24452 -# -# RUN: %clang -o %t %p/inputs/main.c -g +# RUN: %build %p/inputs/main.c --nodefaultlib -o %t # RUN: %lldbmi %t < %s | FileCheck %s # Test lldb-mi -exec-interrupt command. diff --git a/lldb/lit/tools/lldb-mi/exec/exec-next-instruction.test b/lldb/lit/tools/lldb-mi/exec/exec-next-instruction.test index f012a5daceb4..abd4e526375f 100644 --- a/lldb/lit/tools/lldb-mi/exec/exec-next-instruction.test +++ b/lldb/lit/tools/lldb-mi/exec/exec-next-instruction.test @@ -1,7 +1,4 @@ -# XFAIL: system-windows -# -> llvm.org/pr24452 -# -# RUN: %clang -o %t %p/inputs/main.c -g +# RUN: %build %p/inputs/main.c --nodefaultlib -o %t # RUN: %lldbmi %t < %s | FileCheck %s # Test lldb-mi -exec-next-instruction command. diff --git a/lldb/lit/tools/lldb-mi/exec/exec-next.test b/lldb/lit/tools/lldb-mi/exec/exec-next.test index 5e06ac887f8c..87d9d44bb582 100644 --- a/lldb/lit/tools/lldb-mi/exec/exec-next.test +++ b/lldb/lit/tools/lldb-mi/exec/exec-next.test @@ -1,7 +1,4 @@ -# XFAIL: system-windows -# -> llvm.org/pr24452 -# -# RUN: %clang -o %t %p/inputs/main.c -g +# RUN: %build %p/inputs/main.c --nodefaultlib -o %t # RUN: %lldbmi %t < %s | FileCheck %s # Test lldb-mi -exec-next command. diff --git a/lldb/lit/tools/lldb-mi/exec/exec-step-instruction.test b/lldb/lit/tools/lldb-mi/exec/exec-step-instruction.test index ba95d687b171..0613fb5c7934 100644 --- a/lldb/lit/tools/lldb-mi/exec/exec-step-instruction.test +++ b/lldb/lit/tools/lldb-mi/exec/exec-step-instruction.test @@ -1,7 +1,4 @@ -# XFAIL: system-windows -# -> llvm.org/pr24452 -# -# RUN: %clang -o %t %p/inputs/main.c -g +# RUN: %build %p/inputs/main.c --nodefaultlib -o %t # RUN: %lldbmi %t < %s | FileCheck %s # Test lldb-mi -exec-step-instruction command. diff --git a/lldb/lit/tools/lldb-mi/exec/exec-step.test b/lldb/lit/tools/lldb-mi/exec/exec-step.test index 2a69d449a308..976afb33bcd4 100644 --- a/lldb/lit/tools/lldb-mi/exec/exec-step.test +++ b/lldb/lit/tools/lldb-mi/exec/exec-step.test @@ -1,7 +1,4 @@ -# XFAIL: system-windows -# -> llvm.org/pr24452 -# -# RUN: %clang -o %t %p/inputs/main.c -g +# RUN: %build %p/inputs/main.c --nodefaultlib -o %t # RUN: %lldbmi %t < %s | FileCheck %s # Test lldb-mi -exec-step command. diff --git a/lldb/lit/tools/lldb-mi/symbol/symbol-list-lines.test b/lldb/lit/tools/lldb-mi/symbol/symbol-list-lines.test index 4b9202cd463e..792f283db1bb 100644 --- a/lldb/lit/tools/lldb-mi/symbol/symbol-list-lines.test +++ b/lldb/lit/tools/lldb-mi/symbol/symbol-list-lines.test @@ -1,7 +1,4 @@ -# XFAIL: system-windows -# -> llvm.org/pr24452 -# -# RUN: %clang -o %t %p/inputs/main.c %p/inputs/symbol-list-lines.c %p/inputs/list-lines-helper.c -g +# RUN: %build %p/inputs/main.c %p/inputs/symbol-list-lines.c %p/inputs/list-lines-helper.c --nodefaultlib -o %t # RUN: %lldbmi %t < %s | FileCheck %s # Test lldb-mi -symbol-list-lines command. diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py index 9ebe61b65e36..8143fa96433f 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py @@ -25,7 +25,6 @@ class BreakpointCommandTestCase(TestBase): self.build() self.breakpoint_command_sequence() - @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24528") def test_script_parameters(self): """Test a sequence of breakpoint command add, list, and delete.""" self.build() @@ -45,7 +44,6 @@ class BreakpointCommandTestCase(TestBase): self.addTearDownHook( lambda: self.runCmd("settings clear auto-confirm")) - @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24528") def test_delete_all_breakpoints(self): """Test that deleting all breakpoints works.""" self.build()