scripts/slave/recipes/blink_trybot.expected/linux_fail_debug_git.json - Issue 24650004: Fix hack for test presentation in path api.

Unified Diff: scripts/slave/recipes/blink_trybot.expected/linux_fail_debug_git.json

Issue 24650004: Fix hack for test presentation in path api. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: rebase Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « scripts/slave/recipes/blink_trybot.expected/linux_fail_debug.json ('k') | scripts/slave/recipes/blink_trybot.expected/linux_fail_release.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/blink_trybot.expected/linux_fail_debug_git.json

diff --git a/scripts/slave/recipes/blink_trybot.expected/linux_fail_debug_git.json b/scripts/slave/recipes/blink_trybot.expected/linux_fail_debug_git.json

index c58cb34fb49affecc0099e557d65b2a863a82e1c..8ef45a275e04c5060889b591c78d683a1c8f418d 100644

--- a/scripts/slave/recipes/blink_trybot.expected/linux_fail_debug_git.json

+++ b/scripts/slave/recipes/blink_trybot.expected/linux_fail_debug_git.json

@@ -3,7 +3,7 @@

"cmd": [

"python",

"-u",

- "[DEPOT_TOOLS_ROOT]/gclient.py",

+ "[DEPOT_TOOLS]/gclient.py",

"config",

"--spec",

"cache_dir = '[ROOT]/git_cache'\nsolutions = [{'custom_deps': {'src/third_party/WebKit': 'https://chromium.googlesource.com/chromium/blink.git'}, '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_revision': 'HEAD', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]"

@@ -28,7 +28,7 @@

"cmd": [

"python",

"-u",

- "[DEPOT_TOOLS_ROOT]/gclient.py",

+ "[DEPOT_TOOLS]/gclient.py",

"sync",

"--verbose",

"--with_branch_heads",

@@ -79,7 +79,7 @@

"cmd": [

"python",

"-u",

- "[DEPOT_TOOLS_ROOT]/gclient.py",

+ "[DEPOT_TOOLS]/gclient.py",

"recurse",

"git",

"config",

@@ -92,7 +92,7 @@

"cmd": [

"python",

"-u",

- "[DEPOT_TOOLS_ROOT]/gclient.py",

+ "[DEPOT_TOOLS]/gclient.py",

"recurse",

"git",

"config",

@@ -105,9 +105,9 @@

"cmd": [

"python",

"-u",

- "[DEPOT_TOOLS_ROOT]/apply_issue.py",

+ "[DEPOT_TOOLS]/apply_issue.py",

"-r",

- "[SLAVE_BUILD_ROOT]/src/third_party/WebKit",

+ "[SLAVE_BUILD]/src/third_party/WebKit",

"-i",

"12853011",

"-p",

@@ -122,7 +122,7 @@

"cmd": [

"python",

"-u",

- "[DEPOT_TOOLS_ROOT]/gclient.py",

+ "[DEPOT_TOOLS]/gclient.py",

"runhooks"

"env": {

@@ -136,13 +136,13 @@

"cmd": [

"python",

"-u",

- "[BUILD_ROOT]/scripts/slave/compile.py",

+ "[BUILD]/scripts/slave/compile.py",

"--target",

"Debug",

"--build-dir",

- "[SLAVE_BUILD_ROOT]/src/out",

+ "[SLAVE_BUILD]/src/out",

"--src-dir",

- "[SLAVE_BUILD_ROOT]/src",

+ "[SLAVE_BUILD]/src",

"--build-tool",

"ninja",

"--compiler",

@@ -156,9 +156,9 @@

"cmd": [

"python",

"-u",

- "[BUILD_ROOT]/scripts/slave/chromium/lint_test_files_wrapper.py",

+ "[BUILD]/scripts/slave/chromium/lint_test_files_wrapper.py",

"--build-dir",

- "[SLAVE_BUILD_ROOT]/src/out",

+ "[SLAVE_BUILD]/src/out",

"--target",

"Debug"

@@ -168,9 +168,9 @@

"cmd": [

"python",

"-u",

- "[BUILD_ROOT]/scripts/slave/chromium/test_webkitpy_wrapper.py",

+ "[BUILD]/scripts/slave/chromium/test_webkitpy_wrapper.py",

"--build-dir",

- "[SLAVE_BUILD_ROOT]/src/out",

+ "[SLAVE_BUILD]/src/out",

"--target",

"Debug"

@@ -181,11 +181,11 @@

"cmd": [

"python",

"-u",

- "[BUILD_ROOT]/scripts/slave/runtest.py",

+ "[BUILD]/scripts/slave/runtest.py",

"--target",

"Debug",

"--build-dir",

- "[SLAVE_BUILD_ROOT]/src/out",

+ "[SLAVE_BUILD]/src/out",

"--no-xvfb",

"--factory-properties",

"{\"GIT_MODE\": true, \"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Debug\", \"buildername\": \"TestBuilder\", \"buildnumber\": 571, \"config_name\": \"blink\", \"issue\": 12853011, \"mastername\": \"chromium.testing.master\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

@@ -200,11 +200,11 @@

"cmd": [

"python",

"-u",

- "[BUILD_ROOT]/scripts/slave/runtest.py",

+ "[BUILD]/scripts/slave/runtest.py",

"--target",

"Debug",

"--build-dir",

- "[SLAVE_BUILD_ROOT]/src/out",

+ "[SLAVE_BUILD]/src/out",

"--no-xvfb",

"--factory-properties",

@@ -219,11 +219,11 @@

"cmd": [

"python",

"-u",

- "[BUILD_ROOT]/scripts/slave/runtest.py",

+ "[BUILD]/scripts/slave/runtest.py",

"--target",

"Debug",

"--build-dir",

- "[SLAVE_BUILD_ROOT]/src/out",

+ "[SLAVE_BUILD]/src/out",

"--no-xvfb",

"--factory-properties",

@@ -239,24 +239,24 @@

"cmd": [

"python",

"-u",

- "[BUILD_ROOT]/scripts/slave/runtest.py",

+ "[BUILD]/scripts/slave/runtest.py",

"--target",

"Debug",

"--build-dir",

- "[SLAVE_BUILD_ROOT]/src/out",

+ "[SLAVE_BUILD]/src/out",

"--no-xvfb",

"--factory-properties",

"--build-properties",

"--run-python-script",

- "[BUILD_ROOT]/scripts/slave/chromium/layout_test_wrapper.py",

+ "[BUILD]/scripts/slave/chromium/layout_test_wrapper.py",

"--target",

"Debug",

"-o",

- "[SLAVE_BUILD_ROOT]/layout-test-results",

+ "[SLAVE_BUILD]/layout-test-results",

"--build-dir",

- "[SLAVE_BUILD_ROOT]/src/out",

+ "[SLAVE_BUILD]/src/out",

"--json-test-results",

"/path/to/tmp/json"

@@ -304,11 +304,11 @@

"cmd": [

"python",

"-u",

- "[BUILD_ROOT]/scripts/slave/chromium/archive_layout_test_results.py",

+ "[BUILD]/scripts/slave/chromium/archive_layout_test_results.py",

"--results-dir",

- "[SLAVE_BUILD_ROOT]/layout-test-results",

+ "[SLAVE_BUILD]/layout-test-results",

"--build-dir",

- "[SLAVE_BUILD_ROOT]/src/out",

+ "[SLAVE_BUILD]/src/out",

"--build-number",

"571",

"--builder-name",

@@ -330,9 +330,9 @@

"cmd": [

"python",

"-u",

- "[BUILD_ROOT]/scripts/slave/gclient_safe_revert.py",

+ "[BUILD]/scripts/slave/gclient_safe_revert.py",

".",

- "[DEPOT_TOOLS_ROOT]/gclient"

+ "[DEPOT_TOOLS]/gclient"

"name": "gclient revert",

"seed_steps": [

@@ -346,7 +346,7 @@

"cmd": [

"python",

"-u",

- "[DEPOT_TOOLS_ROOT]/gclient.py",

+ "[DEPOT_TOOLS]/gclient.py",

"runhooks"

"env": {

@@ -360,13 +360,13 @@

"cmd": [

"python",

"-u",

- "[BUILD_ROOT]/scripts/slave/compile.py",

+ "[BUILD]/scripts/slave/compile.py",

"--target",

"Debug",

"--build-dir",

- "[SLAVE_BUILD_ROOT]/src/out",

+ "[SLAVE_BUILD]/src/out",

"--src-dir",

- "[SLAVE_BUILD_ROOT]/src",

+ "[SLAVE_BUILD]/src",

"--build-tool",

"ninja",

"--compiler",

@@ -382,24 +382,24 @@

"cmd": [

"python",

"-u",

- "[BUILD_ROOT]/scripts/slave/runtest.py",

+ "[BUILD]/scripts/slave/runtest.py",

"--target",

"Debug",

"--build-dir",

- "[SLAVE_BUILD_ROOT]/src/out",

+ "[SLAVE_BUILD]/src/out",

"--no-xvfb",

"--factory-properties",

"--build-properties",

"--run-python-script",

- "[BUILD_ROOT]/scripts/slave/chromium/layout_test_wrapper.py",

+ "[BUILD]/scripts/slave/chromium/layout_test_wrapper.py",

"--target",

"Debug",

"-o",

- "[SLAVE_BUILD_ROOT]/layout-test-results",

+ "[SLAVE_BUILD]/layout-test-results",

"--build-dir",

- "[SLAVE_BUILD_ROOT]/src/out",

+ "[SLAVE_BUILD]/src/out",

"--json-test-results",

"/path/to/tmp/json"