Skip to content

Commit d900a06

Browse files
authored
Update 'lldb-remote-linux-ubuntu' builder, remove --min/max-gdbserver-port arguments. (#244)
Removed `--min/max-gdbserver-port` arguments when executing the lldb-server instance on the remote target host. Looks like these arguments are not working properly, lets just avoid using them for awhile. Removed '--log-channel' and '--log-file' arguments for the lldb-server instance as useless for this run configuration. Removed the remote target rebooting after the tests get done.
1 parent aa6017d commit d900a06

File tree

1 file changed

+2
-17
lines changed

1 file changed

+2
-17
lines changed

buildbot/osuosl/master/config/builders.py

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3342,6 +3342,7 @@
33423342
"LLVM_INCLUDE_BENCHMARKS" : "OFF",
33433343
"LLVM_PARALLEL_LINK_JOBS" : 8,
33443344
"CLANG_DEFAULT_LINKER" : "lld",
3345+
"LLVM_LIT_ARGS" : "-v -vv --threads=8",
33453346

33463347
"LLDB_TEST_ARCH" : "aarch64",
33473348
"LLDB_TEST_COMPILER" : util.Interpolate("%(prop:tools_root_path)s/aarch64-clang-18/bin/clang"),
@@ -3420,35 +3421,19 @@
34203421
util.ShellArg(command=[ "scp", "lldb-server", util.Interpolate("%(prop:remote_test_user)s@%(prop:remote_test_host)s:~/lldb-server") ], logname="stdio"),
34213422
util.ShellArg(command=[ "ssh", util.Interpolate("%(prop:remote_test_user)s@%(prop:remote_test_host)s"), "chmod +x ~/lldb-server" ], logname="stdio"),
34223423
util.ShellArg(command=[ "ssh", util.Interpolate("%(prop:remote_test_user)s@%(prop:remote_test_host)s"),
3423-
"~/lldb-server p --log-channels 'lldb all' --listen '*:1234' " \
3424-
"--server --min-gdbserver-port 1236 --max-gdbserver-port 1246 " \
3425-
"--log-file ./lldb-server.log > /dev/null 2>&1 &" ], logname="stdio"),
3424+
"~/lldb-server p --listen '*:1234' --server > /dev/null 2>&1 &" ], logname="stdio"),
34263425
],
34273426
workdir = util.Interpolate("%(prop:builddir)s/lldb-server-install/bin"),
34283427
description = "execute lldb-server on remote target",
34293428
haltOnFailure = True,
34303429
),
34313430
],
34323431
),
3433-
post_finalize_steps = [
3434-
#Note: add the following line into the /etc/sudoers file on the remote target
3435-
# to allow rebooting without entering the sudo's password:
3436-
# [/etc/sudoers]
3437-
# ...
3438-
# ubuntu ALL=NOPASSWD:/sbin/reboot
3439-
steps.ShellCommand(name = "restart-target-finalize",
3440-
command = [ "ssh", util.Interpolate("%(prop:remote_test_user)s@%(prop:remote_test_host)s"),
3441-
"((sleep 5 && sudo reboot) > /dev/null 2>&1 &); exit 0;"
3442-
],
3443-
alwaysRun = True,
3444-
),
3445-
],
34463432
env = {
34473433
'CCACHE_DIR' : util.Interpolate("%(prop:builddir)s/ccache-db"),
34483434
# TMP/TEMP within the build dir (to utilize a ramdisk).
34493435
'TMP' : util.Interpolate("%(prop:builddir)s/build"),
34503436
'TEMP' : util.Interpolate("%(prop:builddir)s/build"),
3451-
'LIT_OPTS' : "-a -v --threads=8",
34523437
},
34533438
)
34543439
},

0 commit comments

Comments
 (0)