Reland of Stop silently accepting unsupported flags in test binaries

tools_webrtc/valgrind/webrtc_tests.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 """Runs various WebRTC tests through valgrind_test.py.
 
 This script inherits the chrome_tests.py in Chrome, but allows running any test
 instead of only the hard-coded ones. It uses the -t cmdline flag to do this, and
 only supports specifying a single test for each run.
 
 Suppression files:
 The Chrome valgrind directory we use as a DEPS dependency contains the following
 suppression files:
   valgrind/memcheck/suppressions.txt
   valgrind/memcheck/suppressions_mac.txt
 Since they're referenced from the chrome_tests.py script, we have similar files
 below the directory of this script. When executing, this script will setup both
 Chrome's suppression files and our own, so we can easily maintain WebRTC
 specific suppressions in our own files.
 """
 
+import argparse
 import logging
 import optparse
 import os
 import sys
 
 import logging_utils
 import path_utils
 
 import chrome_tests
 
@@ skipping 80 matching lines @@
                           'developers/maintainers.\nPlease note that the <tool>'
                           '.logs directory will be clobbered on tool startup.'))
   parser.add_option("--test-launcher-bot-mode", action="store_true",
                     help="run the tests with --test-launcher-bot-mode")
   parser.add_option("--test-launcher-total-shards", type=int,
                     help="run the tests with --test-launcher-total-shards")
   parser.add_option("--test-launcher-shard-index", type=int,
                     help="run the tests with --test-launcher-shard-index")
   options, args = parser.parse_args()
 
+  ignore_parser = argparse.ArgumentParser()
+  # Ignore Chromium-specific flags
+  # TODO(oprypin): Remove (bugs.webrtc.org/8115)
+  ignore_parser.add_argument('--isolated-script-test-output',
+                             type=str, default=None)
+  ignore_parser.add_argument('--isolated-script-test-chartjson-output',
+                             type=str, default=None)
+  _, args = ignore_parser.parse_known_args(args)
+
   if options.verbose:
     logging_utils.config_root(logging.DEBUG)
   else:
     logging_utils.config_root()
 
   if not options.test:
     parser.error('--test not specified')
 
   # Support build dir both with and without the target.
   if (options.target and options.build_dir and
       not options.build_dir.endswith(options.target)):
     options.build_dir = os.path.join(options.build_dir, options.target)
 
   # If --build_dir is provided, prepend it to the test executable if needed.
   test_executable = options.test
   if options.build_dir and not test_executable.startswith(options.build_dir):
     test_executable = os.path.join(options.build_dir, test_executable)
   args = [test_executable] + args
 
   test = WebRTCTest(options.test, options, args, 'cmdline')
   return test.Run()
 
 if __name__ == '__main__':
   return_code = main(sys.argv)
   sys.exit(return_code)