Replace dash by underscore in the command line argument before absl flag parsing.
The expected behavior is to have something similar than python: https://docs.python.org/dev/library/argparse.html#dest: "Any internal - characters will be converted to _ characters to make sure the string is a valid attribute name". This allows to catch chromium arguments like 'isolated-script-test-output' that previously needed some preprocessing done for example in flags_compatibility.py. This CL also fixes a fuchsia specific issue where the test runner needs a 'isolated-script-test-output' argument but then pass the argument to WebRTC that expects a 'isolated_script_test_output' argument. Thus calling flags_compatibility before the test_runner fails and there is not much room to change the argument in between the test runner and the test. Change-Id: I48a591743fa50484a0ec584a3f9e97d9e0fd25ef Bug: webrtc:14694 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/284541 Commit-Queue: Jeremy Leconte <jleconte@google.com> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Artem Titov <titovartem@webrtc.org> Cr-Commit-Position: refs/heads/main@{#38707}
This commit is contained in:
committed by
WebRTC LUCI CQ
parent
a3a3b6d798
commit
c6ae33fb07
@ -9,6 +9,9 @@
|
||||
*/
|
||||
|
||||
#include <memory>
|
||||
#include <regex>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "absl/debugging/failure_signal_handler.h"
|
||||
#include "absl/debugging/symbolize.h"
|
||||
@ -16,11 +19,44 @@
|
||||
#include "test/gmock.h"
|
||||
#include "test/test_main_lib.h"
|
||||
|
||||
namespace {
|
||||
|
||||
std::vector<std::string> ReplaceDashesWithUnderscores(int argc, char* argv[]) {
|
||||
std::vector<std::string> args(argv, argv + argc);
|
||||
for (std::string& arg : args) {
|
||||
// Only replace arguments that starts with a dash.
|
||||
if (!arg.empty() && arg[0] == '-') {
|
||||
// Don't replace the 2 first characters.
|
||||
auto begin = arg.begin() + 2;
|
||||
// Replace dashes on the left of '=' or on all the arg if no '=' is found.
|
||||
auto end = std::find(arg.begin(), arg.end(), '=');
|
||||
std::replace(begin, end, '-', '_');
|
||||
}
|
||||
}
|
||||
return args;
|
||||
}
|
||||
|
||||
std::vector<char*> VectorOfStringsToVectorOfPointers(
|
||||
std::vector<std::string>& input) {
|
||||
std::vector<char*> output(input.size());
|
||||
for (size_t i = 0; i < input.size(); ++i) {
|
||||
output[i] = &(input[i][0]);
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
int main(int argc, char* argv[]) {
|
||||
// Initialize the symbolizer to get a human-readable stack trace
|
||||
absl::InitializeSymbolizer(argv[0]);
|
||||
testing::InitGoogleMock(&argc, argv);
|
||||
absl::ParseCommandLine(argc, argv);
|
||||
// Before parsing the arguments with the absl flag library, any internal '-'
|
||||
// characters will be converted to '_' characters to make sure the string is a
|
||||
// valid attribute name.
|
||||
std::vector<std::string> new_argv = ReplaceDashesWithUnderscores(argc, argv);
|
||||
std::vector<char*> raw_new_argv = VectorOfStringsToVectorOfPointers(new_argv);
|
||||
absl::ParseCommandLine(argc, &raw_new_argv[0]);
|
||||
|
||||
// This absl handler use unsupported features/instructions on Fuchsia
|
||||
#if !defined(WEBRTC_FUCHSIA)
|
||||
|
||||
@ -48,11 +48,19 @@
|
||||
ABSL_FLAG(std::string,
|
||||
NSTreatUnknownArgumentsAsOpen,
|
||||
"",
|
||||
"Intentionally ignored flag intended for iOS simulator.");
|
||||
"Intentionally ignored flag intended for iOS test runner.");
|
||||
ABSL_FLAG(std::string,
|
||||
ApplePersistenceIgnoreState,
|
||||
"",
|
||||
"Intentionally ignored flag intended for iOS simulator.");
|
||||
"Intentionally ignored flag intended for iOS test runner.");
|
||||
ABSL_FLAG(bool,
|
||||
enable_run_ios_unittests_with_xctest,
|
||||
false,
|
||||
"Intentionally ignored flag intended for iOS test runner.");
|
||||
ABSL_FLAG(bool,
|
||||
write_compiled_tests_json_to_writable_path,
|
||||
false,
|
||||
"Intentionally ignored flag intended for iOS test runner.");
|
||||
|
||||
// This is the cousin of isolated_script_test_perf_output, but we can't dictate
|
||||
// where to write on iOS so the semantics of this flag are a bit different.
|
||||
@ -64,6 +72,12 @@ ABSL_FLAG(
|
||||
"described by histogram.proto in "
|
||||
"https://chromium.googlesource.com/catapult/.");
|
||||
|
||||
#elif defined(WEBRTC_FUCHSIA)
|
||||
ABSL_FLAG(std::string, use_vulkan, "", "Intentionally ignored flag.");
|
||||
#else
|
||||
// TODO(bugs.webrtc.org/8115): Remove workaround when fixed.
|
||||
ABSL_FLAG(bool, no_sandbox, false, "Intentionally ignored flag.");
|
||||
ABSL_FLAG(bool, test_launcher_bot_mode, false, "Intentionally ignored flag.");
|
||||
#endif
|
||||
|
||||
ABSL_FLAG(std::string,
|
||||
|
||||
Reference in New Issue
Block a user