From 60186f4ffb00d95490062855210203461019efc5 Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Thu, 24 Sep 2009 13:31:40 +0000 Subject: Revert "DevTools: repair on linux and reenable breakpoint tests" revision 27060. Caused regression on Webkit Mac10.5 and Webkit Linux (dbg)(3) TBR=yurys TEST=none BUG=none Review URL: http://codereview.chromium.org/225027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27062 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/debugger/devtools_sanity_unittest.cc | 4 ++-- webkit/glue/devtools/js/tests.js | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index a89c687..6393de6 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -161,12 +161,12 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, } // Tests set breakpoint. -IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestSetBreakpoint) { +IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestSetBreakpoint) { RunTest("testSetBreakpoint", kDebuggerTestPage); } // Tests eval on call frame. -IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestEvalOnCallFrame) { +IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestEvalOnCallFrame) { RunTest("testEvalOnCallFrame", kDebuggerTestPage); } diff --git a/webkit/glue/devtools/js/tests.js b/webkit/glue/devtools/js/tests.js index 7c241ad..8fced0b 100644 --- a/webkit/glue/devtools/js/tests.js +++ b/webkit/glue/devtools/js/tests.js @@ -520,10 +520,7 @@ TestSuite.prototype.showMainPageScriptSource_ = function(scriptName, callback) { 'Unexpected number of scripts(' + test.optionsToString_(options) + ')'); // Select page's script if it's not current option. - var scriptResource; - if (options[scriptSelect.selectedIndex].text === scriptName) { - scriptResource = options[scriptSelect.selectedIndex].representedObject; - } else { + if (options[scriptSelect.selectedIndex].text !== scriptName) { var pageScriptIndex = -1; for (var i = 0; i < options.length; i++) { if (options[i].text === scriptName) { @@ -534,13 +531,12 @@ TestSuite.prototype.showMainPageScriptSource_ = function(scriptName, callback) { test.assertTrue(-1 !== pageScriptIndex, 'Script with url ' + scriptName + ' not found among ' + test.optionsToString_(options)); - scriptResource = options[pageScriptIndex].representedObject; - // Current panel is 'Scripts'. WebInspector.currentPanel._showScriptOrResource(scriptResource); test.assertEquals(pageScriptIndex, scriptSelect.selectedIndex, 'Unexpected selected option index.'); } + var scriptResource = options[scriptSelect.selectedIndex].representedObject; test.assertTrue(scriptResource instanceof WebInspector.Resource, 'Unexpected resource class.'); -- cgit v1.1