Skip to content

Commit 6714905

Browse files
jpbronstedMongoDB Bot
authored and
MongoDB Bot
committed
SERVER-99531 use locally installed GDB on v5 and reenable pretty printer tests for v5 compile variants (#33045)
GitOrigin-RevId: ec53ca43ce6aa8dfad733c21fbb21fbb45e979d2
1 parent 1eb44b0 commit 6714905

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

etc/evergreen_yml_components/variants/amazon/test_dev.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,10 +263,10 @@ buildvariants:
263263
compile_variant: *commit-queue-toolchain-v5
264264
depends_on: []
265265
tasks:
266-
# TODO SERVER-99531 Replace compile_test_parallel_core_stream_TG with
267-
# compile_test_parallel_core_stream_and_pretty_printer_tests_TG and compile_all_but_not_unittests_TG
268-
# when pretty printer tests are supported on v5.
269-
- name: compile_test_parallel_core_stream_TG
266+
- name: compile_test_parallel_core_stream_and_pretty_printer_tests_TG
267+
distros:
268+
- amazon2-arm64-xlarge-commitqueue
269+
- name: compile_all_but_not_unittests_TG
270270
distros:
271271
- amazon2-arm64-xlarge-commitqueue
272272
- name: compile_test_parallel_unittest_stream_TG

etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -702,14 +702,10 @@ buildvariants:
702702
evergreen_remote_exec: on
703703
tasks:
704704
- name: compile_test_parallel_unittest_stream_TG
705-
# TODO SERVER-99531 reenable when pretty printer tests work.
706-
# - name: compile_test_parallel_core_stream_and_pretty_printer_tests_TG
707-
# distros:
708-
# - amazon2-arm64-latest-nvme
709-
#- name: compile_all_but_not_unittests_TG
710-
# distros:
711-
# - amazon2-arm64-latest-nvme
712-
- name: compile_test_parallel_core_stream_TG
705+
- name: compile_test_parallel_core_stream_and_pretty_printer_tests_TG
706+
distros:
707+
- amazon2-arm64-latest-nvme
708+
- name: compile_all_but_not_unittests_TG
713709
distros:
714710
- amazon2-arm64-latest-nvme
715711
- name: compile_test_parallel_dbtest_stream_TG

etc/scons/mongodbtoolchain_v5_clang.vars

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ if not ARGUMENTS.get('CC') and not ARGUMENTS.get("CXX") and platform.machine() !
5656
CXX = os.path.join(toolchain_bindir, 'clang++')
5757
DWP = os.path.join(toolchain_bindir, 'dwp')
5858
READELF = os.path.join(toolchain_bindir, 'readelf')
59-
GDB = os.path.join(toolchain_bindir, 'gdb')
59+
GDB = os.path.join(local_toolchain_bindir, 'gdb')
6060
AR = os.path.join(toolchain_bindir, 'ar')
6161
AS = os.path.join(toolchain_bindir, 'as')
6262
OBJCOPY = os.path.join(toolchain_bindir, 'llvm-objcopy')

etc/scons/mongodbtoolchain_v5_gcc.vars

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@ if not ARGUMENTS.get('CC') and not ARGUMENTS.get("CXX"):
5959
OBJCOPY = os.path.join(toolchain_bindir, 'objcopy')
6060
DWP = os.path.join(toolchain_bindir, 'dwp')
6161
READELF = os.path.join(toolchain_bindir, 'readelf')
62-
GDB = os.path.join(toolchain_bindir, 'gdb')
62+
GDB = os.path.join(local_toolchain_bindir, 'gdb')
6363
DWARF_VERSION=5

0 commit comments

Comments
 (0)