Support variable substitution and tryserver- and waterfall-only cmd line args.

scripts/slave/recipes/chromium_trybot.py

Index: scripts/slave/recipes/chromium_trybot.py
diff --git a/scripts/slave/recipes/chromium_trybot.py b/scripts/slave/recipes/chromium_trybot.py
index eda540245cdf8274db0323486a8ea694ec017624..afcad23ae6073e34c86d201a4d2534ea4584586f 100644
--- a/scripts/slave/recipes/chromium_trybot.py
+++ b/scripts/slave/recipes/chromium_trybot.py
@@ -217,6 +217,7 @@ def _RunStepsInternal(api):
 
   bot_config_object = api.chromium_tests.create_bot_config_object(
       bot_config['mastername'], bot_config['buildername'])
+  api.chromium_tests.set_precommit_mode()
   api.chromium_tests.configure_build(
       bot_config_object, override_bot_type='builder_tester')
 
@@ -493,6 +494,30 @@ def GenTests(api):
   )
 
   yield (
+    api.test('dynamic_gtest_with_args_on_trybot') +
+    props() +
+    api.platform.name('linux') +
+    api.override_step_data('read test spec', api.json.output({
+        'Linux Tests': {
+            'gtest_tests': [
+                {
+                  'test': 'base_unittests',
+                  'args': ['--correct-common-arg'],
+                  'non_precommit_args': ['--THIS-ARG-SHOULD-NOT-BE-PRESENT'],
+                  'precommit_args': [
+                    '--these-args-should-be-present',
+                    '--mastername=\"${master_name}\"',
+                    '--buildername=\"${builder_name}\"',
+                    '--buildrevision=\"${build_revision}\"',
+                  ],
+                },
+            ],
+        },
+    })) +
+    suppress_analyze()
+  )
+
+  yield (
     api.test('swarming_trigger_failure') +
     props() +
     api.platform.name('linux') +