Fix release stripping and test_with_scope target --no-strip uses action='store_true', so options.no_strip defaults to False rather than None and `if options.no_strip is None:` never triggered release stripping. Check `if not options.no_strip:` instead. Also move test_with_scope.cc from gn_lib to gn_unittests, and remove leftover fmt_opts variables in tools/run_formatter.sh. Change-Id: I2f5aedb72609191cdee1dba226e3824aab2b98f5 Reviewed-on: https://gn-review.googlesource.com/c/gn/+/29062 Reviewed-by: Matt Stark <msta@google.com> Commit-Queue: Takuto Ikuta <tikuta@google.com>
diff --git a/build/gen.py b/build/gen.py index 1809572..ce0f157 100755 --- a/build/gen.py +++ b/build/gen.py
@@ -518,7 +518,7 @@ ldflags.append('-Wl,--gc-sections') # Omit all symbol information from the output file. - if options.no_strip is None: + if not options.no_strip: if platform.is_darwin(): ldflags.append('-Wl,-S') elif platform.is_aix(): @@ -897,7 +897,6 @@ 'src/util/sys_info.cc', 'src/util/ticks.cc', 'src/util/worker_pool.cc', - 'src/gn/test_with_scope.cc', ] }, } @@ -1001,6 +1000,7 @@ 'src/gn/target_unittest.cc', 'src/gn/template_unittest.cc', 'src/gn/test_with_scheduler.cc', + 'src/gn/test_with_scope.cc', 'src/gn/tokenizer_unittest.cc', 'src/gn/unique_vector_unittest.cc', 'src/gn/value_unittest.cc',
diff --git a/tools/run_formatter.sh b/tools/run_formatter.sh index 9a18501..d5f657a 100755 --- a/tools/run_formatter.sh +++ b/tools/run_formatter.sh
@@ -1,16 +1,14 @@ #!/bin/bash -eu -# Reformat the C++ and Rust sources. +# Reformat the C++ sources. # Assume this is under tools/. cd "$(dirname "$(dirname "$0")")" if [ "${1:-}" = "--diff" ]; then clang_format_opts=(--dry-run -Werror) - fmt_opts=(--check) else clang_format_opts=(-i) - fmt_opts=() fi if [ -z "${CLANG_FORMAT:-}" ]; then