Author: zturner Date: Mon Nov 19 07:06:10 2018 New Revision: 347213 URL: http://llvm.org/viewvc/llvm-project?rev=347213&view=rev Log: 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 Added: lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit Modified: lldb/trunk/lit/ExecControl/StopHook/stop-hook-threads.test lldb/trunk/lit/ExecControl/StopHook/stop-hook.test Added: lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit?rev=347213&view=auto ============================================================================== --- lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit (added) +++ lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-1.lldbinit Mon Nov 19 07:06:10 2018 @@ -0,0 +1 @@ +target stop-hook add -n b -o "expr ptr" Added: lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit?rev=347213&view=auto ============================================================================== --- lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit (added) +++ lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-2.lldbinit Mon Nov 19 07:06:10 2018 @@ -0,0 +1 @@ +target stop-hook add -f stop-hook.c -l 30 -e 34 -o "expr ptr" \ No newline at end of file Added: lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit?rev=347213&view=auto ============================================================================== --- lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit (added) +++ lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-3.lldbinit Mon Nov 19 07:06:10 2018 @@ -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 Added: lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit?rev=347213&view=auto ============================================================================== --- lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit (added) +++ lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-threads-1.lldbinit Mon Nov 19 07:06:10 2018 @@ -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 Added: lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit?rev=347213&view=auto ============================================================================== --- lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit (added) +++ lldb/trunk/lit/ExecControl/StopHook/Inputs/stop-hook-threads-2.lldbinit Mon Nov 19 07:06:10 2018 @@ -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 Modified: lldb/trunk/lit/ExecControl/StopHook/stop-hook-threads.test URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/ExecControl/StopHook/stop-hook-threads.test?rev=347213&r1=347212&r2=347213&view=diff ============================================================================== --- lldb/trunk/lit/ExecControl/StopHook/stop-hook-threads.test (original) +++ lldb/trunk/lit/ExecControl/StopHook/stop-hook-threads.test Mon Nov 19 07:06:10 2018 @@ -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 Modified: lldb/trunk/lit/ExecControl/StopHook/stop-hook.test URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/ExecControl/StopHook/stop-hook.test?rev=347213&r1=347212&r2=347213&view=diff ============================================================================== --- lldb/trunk/lit/ExecControl/StopHook/stop-hook.test (original) +++ lldb/trunk/lit/ExecControl/StopHook/stop-hook.test Mon Nov 19 07:06:10 2018 @@ -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" _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
