Skip to content

Commit

Permalink
pw_string: Reenable insert, erase tests
Browse files Browse the repository at this point in the history
This CL re-enables tests for insert and erase that were disabled while
debugging CQ failures in pwrev/148333.

These tests push the qemu_gcc version of string_test over the same flash
size threshold that the qemu_clang version crossed some months ago. In
particular, the qemu_gcc_debug version no longer fits into lm3s6965evb's
flash size of 255 KiB. The qemu_clang workaround of only building the
"size_optimized" version of string_test for that target has been applied
to qemu_gcc as well.

Bug: b/244604080
Change-Id: Ia525c87e28475ff568e5015870279edbdc3a12a5
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/149434
Commit-Queue: Aaron Green <[email protected]>
Reviewed-by: Prabhu Karthikeyan Rajasekaran <[email protected]>
Presubmit-Verified: CQ Bot Account <[email protected]>
  • Loading branch information
nopsledder authored and CQ Bot Account committed Jun 3, 2023
1 parent ce3e128 commit 7c87569
Show file tree
Hide file tree
Showing 3 changed files with 292 additions and 292 deletions.
15 changes: 10 additions & 5 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -236,18 +236,23 @@ if (pw_arduino_build_CORE_PATH != "") {
}
}

_build_pigweed_default_at_all_optimization_levels("qemu_gcc") {
toolchain_prefix =
"$dir_pigweed/targets/lm3s6965evb_qemu:lm3s6965evb_qemu_gcc_"
}

# TODO(b/244604080): Inline string tests are too big to fit in the QEMU firmware
# except under a size-optimized build. For now, only build size-optimized.
#
# _build_pigweed_default_at_all_optimization_levels("qemu_gcc") {
# toolchain_prefix =
# "$dir_pigweed/targets/lm3s6965evb_qemu:lm3s6965evb_qemu_gcc_"
# }
# _build_pigweed_default_at_all_optimization_levels("qemu_clang") {
# toolchain_prefix =
# "$dir_pigweed/targets/lm3s6965evb_qemu:lm3s6965evb_qemu_clang_"
# }
group("qemu_gcc_size_optimized") {
deps = [ ":pigweed_default($dir_pigweed/targets/lm3s6965evb_qemu:lm3s6965evb_qemu_gcc_size_optimized)" ]
}
group("qemu_gcc") {
deps = [ ":qemu_gcc_size_optimized" ]
}
group("qemu_clang_size_optimized") {
deps = [ ":pigweed_default($dir_pigweed/targets/lm3s6965evb_qemu:lm3s6965evb_qemu_clang_size_optimized)" ]
}
Expand Down
7 changes: 3 additions & 4 deletions pw_presubmit/py/pw_presubmit/pigweed_presubmit.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,11 @@ def _gn_combined_build_check_targets() -> Sequence[str]:

# QEMU doesn't run on Windows.
if sys.platform != 'win32':
build_targets.extend(_at_all_optimization_levels('qemu_gcc'))

# TODO(b/244604080): For the pw::InlineString tests, qemu_clang_debug
# and qemu_clang_speed_optimized produce a binary too large for the
# TODO(b/244604080): For the pw::InlineString tests, qemu_*_debug
# and qemu_*_speed_optimized produce a binary too large for the
# QEMU target's 256KB flash. Restore debug and speed optimized
# builds when this is fixed.
build_targets.append('qemu_gcc_size_optimized')
build_targets.append('qemu_clang_size_optimized')

# TODO(b/240982565): SocketStream currently requires Linux.
Expand Down
Loading

0 comments on commit 7c87569

Please sign in to comment.