diff options
| -rw-r--r-- | chrome/browser/debugger/devtools_sanity_unittest.cc | 52 | ||||
| -rw-r--r-- | chrome/test/data/devtools/debugger_step.html | 25 | ||||
| -rw-r--r-- | chrome/test/data/devtools/debugger_step.js | 16 |
3 files changed, 0 insertions, 93 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index 1eb48b6..46ad42f 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -64,8 +64,6 @@ const char kResourceTestPage[] = "files/devtools/resource_test_page.html"; const char kSimplePage[] = "files/devtools/simple_page.html"; const char kSyntaxErrorTestPage[] = "files/devtools/script_syntax_error.html"; -const char kDebuggerStepTestPage[] = - "files/devtools/debugger_step.html"; const char kDebuggerClosurePage[] = "files/devtools/debugger_closure.html"; const char kCompletionOnPause[] = @@ -375,56 +373,6 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestEvalOnCallFrame) { RunTest("testEvalOnCallFrame", kDebuggerTestPage); } -#if defined(OS_WIN) || defined(OS_LINUX) -// Sometimes it times out. -// See http://crbug.com/45080 -// See http://crbug.com/46299 -#define MAYBE_TestStepOver FLAKY_TestStepOver -#else -#define MAYBE_TestStepOver TestStepOver -#endif -// Tests step over functionality in the debugger. -IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestStepOver) { - RunTest("testStepOver", kDebuggerStepTestPage); -} - -#if defined(OS_WIN) || defined(OS_LINUX) -// Sometimes it times out. -// See http://crbug.com/45080 -// See http://crbug.com/46299 -#define MAYBE_TestStepOut FLAKY_TestStepOut -#elif defined(OS_CHROMEOS) -// See http://crbug.com/43479 -#define MAYBE_TestStepOut FLAKY_TestStepOut -#else -#define MAYBE_TestStepOut TestStepOut -#endif -// Tests step out functionality in the debugger. -IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestStepOut) { - RunTest("testStepOut", kDebuggerStepTestPage); -} - -#if defined(OS_WIN) || defined(OS_LINUX) -// Sometimes it times out. -// See http://crbug.com/45080 -// See http://crbug.com/46299 -#define MAYBE_TestStepIn FLAKY_TestStepIn -#elif defined(OS_CHROMEOS) -// See http://crbug.com/43479 -#define MAYBE_TestStepIn FLAKY_TestStepIn -#else -#define MAYBE_TestStepIn TestStepIn -#endif -// Disable TestStepIn completely while test expectations are not updated -// in Webkit. See http://crbug.com/46235 -#undef MAYBE_TestStepIn -#define MAYBE_TestStepIn DISABLED_TestStepIn - -// Tests step in functionality in the debugger. -IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestStepIn) { - RunTest("testStepIn", kDebuggerStepTestPage); -} - // Tests that scope can be expanded and contains expected variables. // TODO(japhet): Disabled during webkit landing per bug http://crbug.com/52085 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestExpandScope) { diff --git a/chrome/test/data/devtools/debugger_step.html b/chrome/test/data/devtools/debugger_step.html deleted file mode 100644 index c26cb16..0000000 --- a/chrome/test/data/devtools/debugger_step.html +++ /dev/null @@ -1,25 +0,0 @@ -<html> - -<script src='debugger_step.js'></script> -<script> - -function a() { - var result = d(true); - printResult(result); -} - -function printResult(r) { - var e = document.getElementById('result'); - e.appendChild(document.createTextNode(r)); -} - -</script> - -<body > -<p onclick="a()"> -Calculate -</p> -<div id='result'>Result = </div> - -</body> -</html> diff --git a/chrome/test/data/devtools/debugger_step.js b/chrome/test/data/devtools/debugger_step.js deleted file mode 100644 index bdd856e..0000000 --- a/chrome/test/data/devtools/debugger_step.js +++ /dev/null @@ -1,16 +0,0 @@ -function d(arg) { - if (arg) { - debugger; - } - var y = fact(10); - return y; -} - -function fact(n) { - var r = 1; - while (n > 1) { - r *= n; - --n; - } - return r; -} |
