diff options
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/platform_utils_linux.py | 6 | ||||
| -rwxr-xr-x | webkit/tools/layout_tests/run_webkit_tests.py | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/layout_package/platform_utils_linux.py b/webkit/tools/layout_tests/layout_package/platform_utils_linux.py index 7965fb3..b37f0bf 100644 --- a/webkit/tools/layout_tests/layout_package/platform_utils_linux.py +++ b/webkit/tools/layout_tests/layout_package/platform_utils_linux.py @@ -182,7 +182,11 @@ class PlatformUtility(object): # TODO(mmoss) - hard-coded to "Hammer" for now until I look into the scons # output directory logic (and how/if it will change once Linux supports # multiple debug/release targets). - return PathFromBase('chrome', 'Hammer', self.TestShellBinary()) + try: + path = PathFromBase('webkit', 'Hammer', self.TestShellBinary()) + except google.path_utils.PathNotFound: + path = PathFromBase('chrome', 'Hammer', self.TestShellBinary()) + return path def FuzzyMatchBinaryPath(self): """Return the path to the fuzzy matcher binary.""" diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py index 4d982da..48394e2 100755 --- a/webkit/tools/layout_tests/run_webkit_tests.py +++ b/webkit/tools/layout_tests/run_webkit_tests.py @@ -680,7 +680,7 @@ def main(options, args): try: test_shell_binary_path = path_utils.TestShellBinaryPath(options.target) - except: + except path_utils.PathNotFound: print "\nERROR: test_shell is not found. Be sure that you have built it" print "and that you are using the correct build. This script will run the" print "Release one by default. Use --debug to use the Debug build.\n" |