Skip to content

Commit 5647f29

Browse files
committed
Revert "Reapply "[Dexter] Remove builder from Dexter""
Re-application of the Dexter builder removal reversed due to continued errors on the green dragon LLDB buildbot: https://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake/59716/ Cause of the error is unclear, but it looks as though there is some unexpected non-determinism in the test failures. This reverts commit 3232704.
1 parent 13b7629 commit 5647f29

File tree

129 files changed

+497
-287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+497
-287
lines changed

cross-project-tests/debuginfo-tests/dexter-tests/aggregate-indirect-arg.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// REQUIRES: lldb
22
// UNSUPPORTED: system-windows
33
//
4-
// RUN: %clang -O0 -g -lstdc++ %s -o %t
54
// RUN: %dexter --fail-lt 1.0 -w \
6-
// RUN: --binary %t --debugger 'lldb' -- %s
5+
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -g" \
6+
// RUN: --ldflags="-lstdc++" -- %s
77
// Radar 8945514
88

99
class SVal {

cross-project-tests/debuginfo-tests/dexter-tests/asan-deque.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
// lldb-8, even outside of dexter, will sometimes trigger an asan fault in
99
// the debugged process and generally freak out.
1010

11-
// RUN: %clang -O1 -glldb -fsanitize=address -arch x86_64 %s -o %t
1211
// RUN: %dexter --fail-lt 1.0 -w \
13-
// RUN: --binary %t --debugger 'lldb' -- %s
12+
// RUN: --builder 'clang' --debugger 'lldb' \
13+
// RUN: --cflags "-O1 -glldb -fsanitize=address -arch x86_64" \
14+
// RUN: --ldflags="-fsanitize=address" -- %s
1415
#include <deque>
1516

1617
struct A {

cross-project-tests/debuginfo-tests/dexter-tests/asan.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
// Zorg configures the ASAN stage2 bots to not build the asan
44
// compiler-rt. Only run this test on non-asanified configurations.
55
//
6-
// RUN: %clang --driver-mode=gcc -O0 -glldb -fblocks -arch x86_64 \
7-
// RUN: -fsanitize=address %s -o %t
86
// RUN: %dexter --fail-lt 1.0 -w \
9-
// RUN: --binary %t --debugger 'lldb' -- %s
7+
// RUN: --builder 'clang-c' --debugger 'lldb' \
8+
// RUN: --cflags "--driver-mode=gcc -O0 -glldb -fblocks -arch x86_64 \
9+
// RUN: -fsanitize=address" --ldflags="-fsanitize=address" -- %s
1010

1111
struct S {
1212
int a[8];

cross-project-tests/debuginfo-tests/dexter-tests/ctor.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// REQUIRES: lldb
22
// UNSUPPORTED: system-windows
33
//
4-
// RUN: %clang -O0 -glldb %s -o %t
54
// RUN: %dexter --fail-lt 1.0 -w \
6-
// RUN: --binary %t --debugger 'lldb' -- %s
5+
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -glldb" -- %s
76

87
class A {
98
public:

cross-project-tests/debuginfo-tests/dexter-tests/dbg-arg.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// UNSUPPORTED: system-windows
33
//
44
// This test case checks debug info during register moves for an argument.
5-
// RUN: %clang -m64 -mllvm -fast-isel=false -g %s -o %t
65
// RUN: %dexter --fail-lt 1.0 -w \
7-
// RUN: --binary %t --debugger 'lldb' -- %s
6+
// RUN: --builder clang-c --debugger 'lldb' \
7+
// RUN: --cflags "-m64 -mllvm -fast-isel=false -g" -- %s
88
//
99
// Radar 8412415
1010

cross-project-tests/debuginfo-tests/dexter-tests/deferred_globals.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44

55
// REQUIRES: lldb
66
// UNSUPPORTED: system-windows
7-
// RUN: %clang -O0 -g %s -o %t
7+
88
// RUN: %dexter --fail-lt 1.0 -w \
9-
// RUN: --binary %t --debugger 'lldb' -v -- %s
9+
// RUN: --builder 'clang' --debugger 'lldb' \
10+
// RUN: --cflags "-g -O0" -v -- %s
1011

1112
const int d = 100;
1213

cross-project-tests/debuginfo-tests/dexter-tests/global-constant.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// REQUIRES: system-windows
22
//
3-
// RUN: %clang_cl /Z7 /Zi %s -o %t
4-
// RUN: %dexter --fail-lt 1.0 -w --binary %t --debugger 'dbgeng' -- %s
3+
// RUN: %dexter --fail-lt 1.0 -w --builder 'clang-cl_vs2015' \
4+
// RUN: --debugger 'dbgeng' --cflags '/Z7 /Zi' --ldflags '/Z7 /Zi' -- %s
55

66
// Check that global constants have debug info.
77

cross-project-tests/debuginfo-tests/dexter-tests/hello.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// REQUIRES: system-windows
22
//
3-
// RUN: %clang_cl /Z7 /Zi %s -o %t
4-
// RUN: %dexter --fail-lt 1.0 -w --binary %t --debugger 'dbgeng' -- %s
3+
// RUN: %dexter --fail-lt 1.0 -w --builder 'clang-cl_vs2015' \
4+
// RUN: --debugger 'dbgeng' --cflags '/Z7 /Zi' --ldflags '/Z7 /Zi' -- %s
55

66
#include <stdio.h>
77
int main() {

cross-project-tests/debuginfo-tests/dexter-tests/inline-line-gap.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
// REQUIRES: system-windows
22
//
3-
// RUN: %clang_cl /Od /Z7 /Zi %s -o %t
4-
// RUN: %dexter --fail-lt 1.0 -w --binary %t --debugger 'dbgeng' -- %s
3+
// RUN: %dexter --fail-lt 1.0 -w --builder 'clang-cl_vs2015' \
4+
// RUN: --debugger 'dbgeng' --cflags '/Od /Z7 /Zi' \
5+
// RUN: --ldflags '/Od /Z7 /Zi' -- %s
56
//
6-
// RUN: %clang_cl /O2 /Z7 /Zi %s -o %t
7-
// RUN: %dexter --fail-lt 1.0 -w --binary %t \
8-
// RUN: --debugger 'dbgeng' -- %s
7+
// RUN: %dexter --fail-lt 1.0 -w --builder 'clang-cl_vs2015' \
8+
// RUN: --debugger 'dbgeng' --cflags '/O2 /Z7 /Zi' \
9+
// RUN: --ldflags '/O2 /Z7 /Zi' -- %s
910

1011
// This code is structured to have an early exit with an epilogue in the middle
1112
// of the function, which creates a gap between the beginning of the inlined

cross-project-tests/debuginfo-tests/dexter-tests/memvars/bitcast.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
// REQUIRES: lldb
55
// UNSUPPORTED: system-windows
6-
// RUN: %clang -O3 -glldb %s -o %t
7-
// RUN: %dexter --fail-lt 1.0 -w --debugger lldb --binary %t -- %s
6+
// RUN: %dexter --fail-lt 1.0 -w --debugger lldb \
7+
// RUN: --builder 'clang-c' --cflags "-O3 -glldb" -- %s
88

99
//// Adapted from https://bugs.llvm.org/show_bug.cgi?id=34136#c1
1010
//// LowerDbgDeclare has since been updated to look through bitcasts. We still

0 commit comments

Comments
 (0)