Skip to content

Commit 33ef57c

Browse files
committed
[lldb] Temporarily remove --arch flag to dotest
We're trying to move the matrix bot to arm64. But specifying the `--arch=arm64` isn't behaving as we expect. For some reason both `--arch=arm64` *and* `--arch=x86_64` are passed to the tests, which might be the reason why they're failing. Try to remove it for now and see if that changes anything.
1 parent 2281203 commit 33ef57c

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

zorg/jenkins/build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ def lldb_cmake_standalone_builder(target):
654654
test_dir, test_build_dir])
655655
cmake_build_type = conf.cmake_build_type if conf.cmake_build_type else 'RelWithDebInfo'
656656
dotest_args = [
657-
'--arch', 'x86_64', '--build-dir', test_build_dir,
657+
'--build-dir', test_build_dir,
658658
'-t', '--env', 'TERM=vt100'
659659
]
660660
dotest_args.extend(conf.dotest_flags)

zorg/jenkins/jobs/jobs/lldb-cmake-matrix

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ pipeline {
102102
--runtimes="libcxx;libcxxabi;libunwind" \
103103
--cmake-type=Release \
104104
--dotest-flag="--skip-category gmodules" \
105-
--dotest-flag="--arch=arm64"
106105
'''
107106
script {
108107
def LLDB = new org.swift.LLDB()
@@ -133,7 +132,6 @@ pipeline {
133132
--dotest-flag="llgs" \
134133
--dotest-flag="--skip-category" \
135134
--dotest-flag="debugserver" \
136-
--dotest-flag="--arch=arm64" \
137135
--dotest-flag="--dwarf-version=2"
138136
139137
# Give the system some time to recover.
@@ -165,7 +163,6 @@ pipeline {
165163
--dotest-flag="llgs" \
166164
--dotest-flag="--skip-category" \
167165
--dotest-flag="debugserver" \
168-
--dotest-flag="--arch=arm64" \
169166
--dotest-flag="--dwarf-version=4"
170167
171168
# Give the system some time to recover.
@@ -197,7 +194,6 @@ pipeline {
197194
--dotest-flag="llgs" \
198195
--dotest-flag="--skip-category" \
199196
--dotest-flag="debugserver" \
200-
--dotest-flag="--arch=arm64" \
201197
--dotest-flag="--dwarf-version=5"
202198
203199
# Give the system some time to recover.
@@ -266,7 +262,6 @@ pipeline {
266262
--dotest-flag="llgs" \
267263
--dotest-flag="--skip-category" \
268264
--dotest-flag="debugserver" \
269-
--dotest-flag="--arch=arm64"
270265
271266
# Give the system some time to recover.
272267
sleep 120
@@ -336,7 +331,6 @@ pipeline {
336331
--dotest-flag="llgs" \
337332
--dotest-flag="--skip-category" \
338333
--dotest-flag="debugserver" \
339-
--dotest-flag="--arch=arm64"
340334
341335
# Give the system some time to recover.
342336
sleep 120

0 commit comments

Comments
 (0)