From 28d0131d40584898a8a5800206b28ecfbd118a98 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Mon, 19 Nov 2018 15:06:10 +0000 Subject: [PATCH] Don't use -O in lit tests. Because of different shell quoting rules, and the fact that LLDB commands often contain spaces, -O is not portable for writing command lines. Instead, we should use explicit lldbinit files. Differential Revision: https://reviews.llvm.org/D54680 llvm-svn: 347213 --- .../lit/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit | 1 + .../lit/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit | 1 + .../lit/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit | 3 +++ .../StopHook/Inputs/stop-hook-threads-1.lldbinit | 7 +++++++ .../StopHook/Inputs/stop-hook-threads-2.lldbinit | 4 ++++ lldb/lit/ExecControl/StopHook/stop-hook-threads.test | 16 ++-------------- lldb/lit/ExecControl/StopHook/stop-hook.test | 6 +++--- 7 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 lldb/lit/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit create mode 100644 lldb/lit/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit create mode 100644 lldb/lit/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit create mode 100644 lldb/lit/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit create mode 100644 lldb/lit/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit diff --git a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit b/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit new file mode 100644 index 0000000..4ab5d56 --- /dev/null +++ b/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit @@ -0,0 +1 @@ +target stop-hook add -n b -o "expr ptr" diff --git a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit b/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit new file mode 100644 index 0000000..906c18b --- /dev/null +++ b/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit @@ -0,0 +1 @@ +target stop-hook add -f stop-hook.c -l 30 -e 34 -o "expr ptr" \ No newline at end of file diff --git a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit b/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit new file mode 100644 index 0000000..98ed59c --- /dev/null +++ b/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit @@ -0,0 +1,3 @@ +target stop-hook add -f stop-hook.c -l 30 -e 34 +expr ptr +DONE \ No newline at end of file diff --git a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit b/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit new file mode 100644 index 0000000..f192d99 --- /dev/null +++ b/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit @@ -0,0 +1,7 @@ +break set -f stop-hook-threads.cpp -p "Break here to test that the stop-hook" +run +target stop-hook add +frame variable --show-globals g_val +thread list +continue +DONE diff --git a/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit b/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit new file mode 100644 index 0000000..467f60b --- /dev/null +++ b/lldb/lit/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit @@ -0,0 +1,4 @@ +break set -f stop-hook-threads.cpp -p "Break here to test that the stop-hook" +run +target stop-hook add -x 2 -o "frame variable thread_index" +target stop-hook add -o continue diff --git a/lldb/lit/ExecControl/StopHook/stop-hook-threads.test b/lldb/lit/ExecControl/StopHook/stop-hook-threads.test index cdda6c0..f2f1267 100644 --- a/lldb/lit/ExecControl/StopHook/stop-hook-threads.test +++ b/lldb/lit/ExecControl/StopHook/stop-hook-threads.test @@ -1,19 +1,7 @@ # RUN: %cxx %p/Inputs/stop-hook-threads.cpp -g -o %t -# RUN: %lldb -b -s %s -O 'target create %t' \ -# RUN: -O 'break set -f stop-hook-threads.cpp -p "Break here to test that the stop-hook"' \ -# RUN: -O run \ -# RUN: -O 'target stop-hook add' \ -# RUN: -O "frame variable --show-globals g_val" \ -# RUN: -O "thread list" \ -# RUN: -O continue \ -# RUN: -O DONE \ +# RUN: %lldb -b -s %p/Inputs/stop-hook-threads-1.lldbinit -s %s -f %t \ # RUN: | FileCheck --check-prefix=CHECK --check-prefix=CHECK-NO-FILTER %s -# RUN: %lldb -b -s %s \ -# RUN: -O 'target create %t' \ -# RUN: -O 'break set -f stop-hook-threads.cpp -p "Break here to test that the stop-hook"' \ -# RUN: -O run \ -# RUN: -O 'target stop-hook add -x 2 -o "frame variable thread_index"' \ -# RUN: -O 'target stop-hook add -o continue' \ +# RUN: %lldb -b -s %p/Inputs/stop-hook-threads-2.lldbinit -s %s -f %t \ # RUN: | FileCheck --check-prefix=CHECK --check-prefix=CHECK-FILTER %s thread list diff --git a/lldb/lit/ExecControl/StopHook/stop-hook.test b/lldb/lit/ExecControl/StopHook/stop-hook.test index 8db10f5..e50b0c6 100644 --- a/lldb/lit/ExecControl/StopHook/stop-hook.test +++ b/lldb/lit/ExecControl/StopHook/stop-hook.test @@ -1,11 +1,11 @@ # RUN: %cc %p/Inputs/stop-hook.c -g -o %t # Test setting stop-hook per-function -# RUN: %lldb -b -s %s -O 'target create %t' -O 'target stop-hook add -n b -o "expr ptr"' \ +# RUN: %lldb -b -s %p/Inputs/stop-hook-1.lldbinit -s %s -f %t \ # RUN: | FileCheck --check-prefix=CHECK --check-prefix=CHECK-FUNC %s # Test setting stop-hook per-line range -# RUN: %lldb -b -s %s -O 'target create %t' -O 'target stop-hook add -f stop-hook.c -l 30 -e 34 -o "expr ptr"' | FileCheck %s +# RUN: %lldb -b -s %p/Inputs/stop-hook-2.lldbinit -s %s -f %t | FileCheck %s # Test setting stop-hook with multi-line expression -# RUN: %lldb -b -s %s -O 'target create %t' -O 'target stop-hook add -f stop-hook.c -l 30 -e 34' -O 'expr ptr' -O DONE | FileCheck %s +# RUN: %lldb -b -s %p/Inputs/stop-hook-3.lldbinit -s %s -f %t | FileCheck %s break set -f stop-hook.c -p "// Set breakpoint here to test target stop-hook" break set -f stop-hook.c -p "// Another breakpoint which is outside of the stop-hook range" -- 2.7.4