summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryuzo@chromium.org <yuzo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-23 04:14:59 +0000
committeryuzo@chromium.org <yuzo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-23 04:14:59 +0000
commit56aa607b6d0a0cea81e2fa10997993c9d47e9a23 (patch)
treeb18c9a82a0ad538a82905bb09b3f2b7e05261ae7
parentb3d66df1b4d82756d95c047d0b45f6bf43cc670b (diff)
downloadchromium_src-56aa607b6d0a0cea81e2fa10997993c9d47e9a23.zip
chromium_src-56aa607b6d0a0cea81e2fa10997993c9d47e9a23.tar.gz
chromium_src-56aa607b6d0a0cea81e2fa10997993c9d47e9a23.tar.bz2
Revert 45413 - Roll WebKit to 58138 (from 58033)
BUG=none TEST=none TBR=jorlow Review URL: http://codereview.chromium.org/1771004 TBR=yuzo@chromium.org Error log python_slave ..\..\..\scripts\slave\runtest.py --target Release --build-dir src/build nacl_ui_tests.exe --gtest_print_time in dir c:\b\slave\chromium-rel-nacl-tests\build (timeout 600 secs) watching logfiles {} argv: ['python_slave', '..\\..\\..\\scripts\\slave\\runtest.py', '--target', 'Release', '--build-dir', 'src/build', 'nacl_ui_tests.exe', '--gtest_print_time'] environment: APPDATA=C:\Documents and Settings\chrome-bot\Application Data CHROME_HEADLESS=1 COMSPEC=C:\WINDOWS\system32\cmd.exe GYP_MSVS_VERSION=2005 HOMEDRIVE=C: HOMEPATH=\Documents and Settings\chrome-bot LOGNAME=chrome-bot NUMBER_OF_PROCESSORS=4 OS=Windows_NT PATH=c:\b\depot_tools;c:\b\depot_tools\python_bin;C:\WINDOWS\system32;C:\WINDOWS\system32\WBEM PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH PROGRAMFILES=C:\Program Files PWD=c:\b\slave\chromium-rel-nacl-tests\build PYTHONPATH=c:\b\scripts\private;c:\b\scripts\common;c:\b\scripts\slave;c:\b\pylibs;c:\b\symsrc SYSTEMDRIVE=C: SYSTEMROOT=C:\WINDOWS TEMP=C:\DOCUME~1\CHROME~1\LOCALS~1\Temp TMP=C:\DOCUME~1\CHROME~1\LOCALS~1\Temp USERDOMAIN=CODG140 USERNAME=chrome-bot USERPROFILE=C:\Documents and Settings\chrome-bot WINDIR=C:\WINDOWS closing stdin using PTY: False [Running on builder: "None"] c:\b\slave\chromium-rel-nacl-tests\build\src\build\Release\nacl_ui_tests.exe --gtest_print_time [==========] Running 8 tests from 1 test case. [----------] Global test environment set-up. [----------] 8 tests from NaClTest [ RUN ] NaClTest.ServerTest Traceback (most recent call last): File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-httpd", line 50, in ? from port import http_server File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_server.py", line 118 with codecs.open(base_conf_file, "r", "utf-8") as file: ^ SyntaxError: invalid syntax C:\b\slave\chromium-rel-builder\build\src\chrome\test\nacl\nacl_test.cc(91): error: Value of: test_result Actual: false Expected: true Traceback (most recent call last): File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-httpd", line 50, in ? from port import http_server File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_server.py", line 118 with codecs.open(base_conf_file, "r", "utf-8") as file: ^ SyntaxError: invalid syntax [ FAILED ] NaClTest.ServerTest (63984 ms) [ RUN ] NaClTest.SrpcHelloWorld Traceback (most recent call last): File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-httpd", line 50, in ? from port import http_server File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_server.py", line 118 with codecs.open(base_conf_file, "r", "utf-8") as file: ^ SyntaxError: invalid syntax C:\b\slave\chromium-rel-builder\build\src\chrome\test\nacl\nacl_test.cc(91): error: Value of: test_result Actual: false Expected: true Traceback (most recent call last): File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-httpd", line 50, in ? from port import http_server File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_server.py", line 118 with codecs.open(base_conf_file, "r", "utf-8") as file: ^ SyntaxError: invalid syntax [ FAILED ] NaClTest.SrpcHelloWorld (62203 ms) [ RUN ] NaClTest.SrpcBasicTest Traceback (most recent call last): File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-httpd", line 50, in ? from port import http_server File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_server.py", line 118 with codecs.open(base_conf_file, "r", "utf-8") as file: ^ SyntaxError: invalid syntax C:\b\slave\chromium-rel-builder\build\src\chrome\test\nacl\nacl_test.cc(91): error: Value of: test_result Actual: false Expected: true Traceback (most recent call last): File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-httpd", line 50, in ? from port import http_server File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_server.py", line 118 with codecs.open(base_conf_file, "r", "utf-8") as file: ^ SyntaxError: invalid syntax [ FAILED ] NaClTest.SrpcBasicTest (62344 ms) [ RUN ] NaClTest.SrpcSockAddrTest Traceback (most recent call last): File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-httpd", line 50, in ? from port import http_server File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_server.py", line 118 with codecs.open(base_conf_file, "r", "utf-8") as file: ^ SyntaxError: invalid syntax C:\b\slave\chromium-rel-builder\build\src\chrome\test\nacl\nacl_test.cc(91): error: Value of: test_result Actual: false Expected: true Traceback (most recent call last): File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-httpd", line 50, in ? from port import http_server File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_server.py", line 118 with codecs.open(base_conf_file, "r", "utf-8") as file: ^ SyntaxError: invalid syntax [ FAILED ] NaClTest.SrpcSockAddrTest (62391 ms) [ RUN ] NaClTest.SrpcShmTest Traceback (most recent call last): File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-httpd", line 50, in ? from port import http_server File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_server.py", line 118 with codecs.open(base_conf_file, "r", "utf-8") as file: ^ SyntaxError: invalid syntax C:\b\slave\chromium-rel-builder\build\src\chrome\test\nacl\nacl_test.cc(91): error: Value of: test_result Actual: false Expected: true Traceback (most recent call last): File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-httpd", line 50, in ? from port import http_server File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_server.py", line 118 with codecs.open(base_conf_file, "r", "utf-8") as file: ^ SyntaxError: invalid syntax [ FAILED ] NaClTest.SrpcShmTest (62328 ms) [ RUN ] NaClTest.SrpcPluginTest Traceback (most recent call last): File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-httpd", line 50, in ? from port import http_server File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_server.py", line 118 with codecs.open(base_conf_file, "r", "utf-8") as file: ^ SyntaxError: invalid syntax C:\b\slave\chromium-rel-builder\build\src\chrome\test\nacl\nacl_test.cc(91): error: Value of: test_result Actual: false Expected: true Traceback (most recent call last): File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-httpd", line 50, in ? from port import http_server File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_server.py", line 118 with codecs.open(base_conf_file, "r", "utf-8") as file: ^ SyntaxError: invalid syntax [ FAILED ] NaClTest.SrpcPluginTest (62281 ms) [ RUN ] NaClTest.SrpcNrdXferTest Traceback (most recent call last): File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-httpd", line 50, in ? from port import http_server File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_server.py", line 118 with codecs.open(base_conf_file, "r", "utf-8") as file: ^ SyntaxError: invalid syntax C:\b\slave\chromium-rel-builder\build\src\chrome\test\nacl\nacl_test.cc(91): error: Value of: test_result Actual: false Expected: true Traceback (most recent call last): File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-httpd", line 50, in ? from port import http_server File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_server.py", line 118 with codecs.open(base_conf_file, "r", "utf-8") as file: ^ SyntaxError: invalid syntax [ FAILED ] NaClTest.SrpcNrdXferTest (62359 ms) [ RUN ] NaClTest.NpapiHwTest Traceback (most recent call last): File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-httpd", line 50, in ? from port import http_server File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_server.py", line 118 with codecs.open(base_conf_file, "r", "utf-8") as file: ^ SyntaxError: invalid syntax C:\b\slave\chromium-rel-builder\build\src\chrome\test\nacl\nacl_test.cc(91): error: Value of: test_result Actual: false Expected: true Traceback (most recent call last): File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\new-run-webkit-httpd", line 50, in ? from port import http_server File "c:\b\slave\chromium-rel-nacl-tests\build\src\third_party\WebKit\WebKitTools\Scripts\webkitpy\layout_tests\port\http_server.py", line 118 with codecs.open(base_conf_file, "r", "utf-8") as file: ^ SyntaxError: invalid syntax [ FAILED ] NaClTest.NpapiHwTest (62360 ms) [----------] 8 tests from NaClTest (500250 ms total) [----------] Global test environment tear-down [==========] 8 tests from 1 test case ran. (500250 ms total) [ PASSED ] 0 tests. [ FAILED ] 8 tests, listed below: [ FAILED ] NaClTest.ServerTest [ FAILED ] NaClTest.SrpcHelloWorld [ FAILED ] NaClTest.SrpcBasicTest [ FAILED ] NaClTest.SrpcSockAddrTest [ FAILED ] NaClTest.SrpcShmTest [ FAILED ] NaClTest.SrpcPluginTest [ FAILED ] NaClTest.SrpcNrdXferTest [ FAILED ] NaClTest.NpapiHwTest 8 FAILED TESTS program finished with exit code 1 elapsedTime=500.984000 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45418 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 715c4d6..374f8a8 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "58138",
+ "webkit_revision": "58033",
"ffmpeg_revision": "45289",
"skia_revision": "524",
"chromium_git": "http://src.chromium.org/git",