1 files changed, 11 insertions, 7 deletions
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 8ce1bcb..8d7f8ec7 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -275,13 +275,17 @@ bool TestShell::RunFileTest(const TestParams& params) {
   if (inspector_test_mode_)
     shell->ShowDevTools();
 
-  shell->test_is_preparing_ = true;
-  shell->set_test_params(&params);
-  shell->LoadURL(GURL(params.test_url));
-
-  shell->test_is_preparing_ = false;
-  shell->WaitTestFinished();
-  shell->set_test_params(NULL);
+  GURL url(params.test_url);
+  if (url.is_valid()) {  // Don't hang if we have an invalid path.
+    shell->test_is_preparing_ = true;
+    shell->set_test_params(&params);
+    shell->LoadURL(url);
+    shell->test_is_preparing_ = false;
+    shell->WaitTestFinished();
+    shell->set_test_params(NULL);
+  } else {
+    NOTREACHED() << "Invalid url: " << url.spec();
+  }
 
   return true;
 }