| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_ChromiumPracticeTester.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/msan.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ChromiumPracticeTester.json
|
| similarity index 70%
|
| copy from scripts/slave/recipes/chromium.expected/msan.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_fyi_ChromiumPracticeTester.json
|
| index bad0773ca1f0188583e69a7b332d4c854737ae05..f84930c9b42fa9fc65e4586d405b93a7ef963167 100644
|
| --- a/scripts/slave/recipes/chromium.expected/msan.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_ChromiumPracticeTester.json
|
| @@ -5,19 +5,19 @@
|
| "-u",
|
| "[BUILD]/scripts/slave/bot_update.py",
|
| "--master",
|
| - "chromium.memory.fyi",
|
| + "chromium.fyi",
|
| "--builder",
|
| - "Linux MSan Tests",
|
| + "ChromiumPracticeTester",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| - "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
|
| + "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/playground/chromium-blink-merge.git'}]",
|
| "--revision_mapping_file",
|
| "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/WebKit\": \"got_webkit_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| - "src@HEAD"
|
| + "src@1111111"
|
| ],
|
| "name": "bot_update",
|
| "~followup_annotations": [
|
| @@ -66,7 +66,7 @@
|
| "runhooks"
|
| ],
|
| "env": {
|
| - "GYP_DEFINES": "clang=1 component=static_library gomadir='[BUILD]/goma' msan=1 target_arch=x64 use_goma=1"
|
| + "GYP_DEFINES": "component=static_library gomadir='[BUILD]/goma' target_arch=x64 use_goma=1"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| @@ -75,22 +75,13 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/chromium.memory.fyi.json",
|
| + "[SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.memory.fyi.json@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"Linux MSan Tests\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"compile_targets\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_unittests\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_unittests\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json@@@",
|
| + "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| },
|
| @@ -107,7 +98,7 @@
|
| "--paths",
|
| "{\"build\": \"[BUILD]\"}",
|
| "--properties",
|
| - "{\"buildername\": \"Linux MSan Tests\", \"buildnumber\": 571, \"slavename\": \"TestSlavename\"}"
|
| + "{\"buildername\": \"ChromiumPracticeTester\", \"buildnumber\": 571, \"slavename\": \"TestSlavename\"}"
|
| ],
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| @@ -148,43 +139,44 @@
|
| "[BUILD]/scripts/slave/extract_build.py",
|
| "--target",
|
| "Release",
|
| - "--build-url",
|
| - "gs://chromium-memory-fyi-archive/chromium.memory.fyi/Chromium Linux MSan Builder/full-build-linux.zip",
|
| - "--build_revision",
|
| - "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| + "--build-archive-url",
|
| + "gs://test-domain/test-archive.zip",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Linux MSan Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.memory.fyi\", \"parent_buildername\": \"Chromium Linux MSan Builder\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"ChromiumPracticeTester\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"ChromiumPractice\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Linux MSan Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.memory.fyi\", \"parent_buildername\": \"Chromium Linux MSan Builder\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"ChromiumPracticeTester\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"ChromiumPractice\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| ],
|
| "name": "extract build"
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| "[BUILD]/scripts/slave/runtest.py",
|
| "--target",
|
| "Release",
|
| - "--xvfb",
|
| + "--no-xvfb",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Linux MSan Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.memory.fyi\", \"parent_buildername\": \"Chromium Linux MSan Builder\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"ChromiumPracticeTester\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"ChromiumPractice\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Linux MSan Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.memory.fyi\", \"parent_buildername\": \"Chromium Linux MSan Builder\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--annotate=gtest",
|
| - "--test-type=base_unittests",
|
| - "--test-launcher-summary-output",
|
| - "/path/to/tmp/json",
|
| - "--generate-json-file",
|
| - "-o",
|
| - "gtest-results/base_unittests",
|
| - "--builder-name=Linux MSan Tests",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"ChromiumPracticeTester\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"ChromiumPractice\", \"parent_got_revision\": \"1111111\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--builder-name=ChromiumPracticeTester",
|
| "--slave-name=TestSlavename",
|
| "--build-number=571",
|
| - "--enable-msan",
|
| - "base_unittests"
|
| + "--run-python-script",
|
| + "[BUILD]/scripts/slave/chromium/layout_test_wrapper.py",
|
| + "--target",
|
| + "Release",
|
| + "-o",
|
| + "[SLAVE_BUILD]/layout-test-results",
|
| + "--build-dir",
|
| + "[SLAVE_BUILD]/src/out",
|
| + "--json-test-results",
|
| + "/path/to/tmp/json"
|
| ],
|
| - "name": "base_unittests"
|
| + "name": "webkit_tests",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@<br/>Total executed: 9001<br/>@@@"
|
| + ]
|
| }
|
| ]
|
|
|