diff options
| author | Darren Krahn <dkrahn@google.com> | 2023-01-24 21:48:50 +0000 |
|---|---|---|
| committer | CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-01-24 21:48:50 +0000 |
| commit | 1ebe0f74fde0fb35460e1b87a27cb889134c3722 (patch) | |
| tree | 7633663a23990cb3b24d112362beeaf7dbb829ba | |
| parent | b410a540e853ded4e65004160b8b3b395307a097 (diff) | |
| download | open-dice-1ebe0f74fde0fb35460e1b87a27cb889134c3722.tar.gz | |
Update pigweed submodule
Bug: b/265165949
Change-Id: Ic9337f8737739f959d952b127da9eeb1c76133cb
Reviewed-on: https://pigweed-review.googlesource.com/c/open-dice/+/126686
Reviewed-by: Andrew Scull <ascull@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
Pigweed-Auto-Submit: Darren Krahn <dkrahn@google.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | BUILD.gn | 4 | ||||
| -rwxr-xr-x | bootstrap.sh | 6 | ||||
| -rw-r--r-- | include/dice/test_framework.h | 7 | ||||
| m--------- | third_party/pigweed/src | 0 |
5 files changed, 13 insertions, 5 deletions
@@ -2,3 +2,4 @@ .cache compile_commands.json out +build_overrides/pigweed_environment.gni @@ -356,7 +356,7 @@ pw_executable("dice_with_x509_template_cert_main") { ] } -pw_size_report("executable_size_report") { +pw_size_diff("executable_size_report") { title = "Executable sizes (includes thirdparty deps)" base = ":empty_main" binaries = [ @@ -392,7 +392,7 @@ pw_size_report("executable_size_report") { ] } -pw_size_report("library_size_report") { +pw_size_diff("library_size_report") { title = "Library sizes (excludes thirdparty deps)" base = ":empty_lib" binaries = [ diff --git a/bootstrap.sh b/bootstrap.sh index b599594..181daec 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -28,5 +28,11 @@ git submodule update --init # Bootstrap the pigweed environment. . third_party/pigweed/src/bootstrap.sh +# Copy the pigweed environment config with a path fixup. +sed s/environment/third_party\\\/pigweed\\\/src\\\/environment/g \ + < third_party/pigweed/src/build_overrides/pigweed_environment.gni \ + > build_overrides/pigweed_environment.gni +gn format build_overrides/pigweed_environment.gni + # Setup the build. gn gen --export-compile-commands out diff --git a/include/dice/test_framework.h b/include/dice/test_framework.h index 16e1c90..d85ba2b 100644 --- a/include/dice/test_framework.h +++ b/include/dice/test_framework.h @@ -15,10 +15,11 @@ #ifndef DICE_TEST_FRAMEWORK_H_ #define DICE_TEST_FRAMEWORK_H_ -#ifdef DICE_USE_GTEST #include "gtest/gtest.h" -#else -#include "pw_unit_test/framework.h" + +#ifndef DICE_USE_GTEST +// Use pigweed's pw_unit_test::light framework instead of upstream gtest. +#include "pw_unit_test/simple_printing_event_handler.h" #endif #endif // DICE_TEST_FRAMEWORK_H_ diff --git a/third_party/pigweed/src b/third_party/pigweed/src -Subproject 05d860d647f5d0c70d2cc9627f54c1adfa8a825 +Subproject 02c2e12242a68c6a66ad45c7a99c11aad45e322 |