diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome.sln | 32 | ||||
| -rw-r--r-- | chrome/test/debugger/debugger_unittests.py | 22 | ||||
| -rw-r--r-- | chrome/test/debugger/test_protocol.js | 8 |
3 files changed, 31 insertions, 31 deletions
diff --git a/chrome/chrome.sln b/chrome/chrome.sln index 334ceef..48d30e1 100644 --- a/chrome/chrome.sln +++ b/chrome/chrome.sln @@ -1086,11 +1086,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_snapshot", "..\v8\tools\ {EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_shell", "..\v8\tools\visual_studio\v8_shell.vcproj", "{9EBFE04E-0DEF-469A-957E-126FCBD457C7}" - ProjectSection(ProjectDependencies) = postProject - {C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_views", "browser\views\browser_views.vcproj", "{FA537565-7B03-4FFC-AF15-F7A979B72E22}" ProjectSection(ProjectDependencies) = postProject {31D88CBF-DC28-47A8-8838-BF81D528EE74} = {31D88CBF-DC28-47A8-8838-BF81D528EE74} @@ -1098,6 +1093,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_views", "browser\vi {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_shell_sample", "..\v8\tools\visual_studio\v8_shell_sample.vcproj", "{2DE20FFA-6F5E-48D9-84D8-09B044A5B119}" + ProjectSection(ProjectDependencies) = postProject + {C0334F9A-1168-4101-9DD8-C30FB252D435} = {C0334F9A-1168-4101-9DD8-C30FB252D435} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -1314,6 +1314,16 @@ Global {2A70CBF0-847E-4E3A-B926-542A656DC7FE}.Release|Mixed Platforms.Build.0 = Release|Win32 {2A70CBF0-847E-4E3A-B926-542A656DC7FE}.Release|Win32.ActiveCfg = Release|Win32 {2A70CBF0-847E-4E3A-B926-542A656DC7FE}.Release|Win32.Build.0 = Release|Win32 + {2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Debug|Win32.ActiveCfg = Debug|Win32 + {2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Debug|Win32.Build.0 = Debug|Win32 + {2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Release|Any CPU.ActiveCfg = Release|Win32 + {2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Release|Mixed Platforms.Build.0 = Release|Win32 + {2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Release|Win32.ActiveCfg = Release|Win32 + {2DE20FFA-6F5E-48D9-84D8-09B044A5B119}.Release|Win32.Build.0 = Release|Win32 {2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Any CPU.ActiveCfg = Debug|Win32 {2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {2E2D3301-2EC4-4C0F-B889-87073B30F673}.Debug|Mixed Platforms.Build.0 = Debug|Win32 @@ -1853,16 +1863,6 @@ Global {9946A048-043B-4F8F-9E07-9297B204714C}.Release|Mixed Platforms.Build.0 = Release|Win32 {9946A048-043B-4F8F-9E07-9297B204714C}.Release|Win32.ActiveCfg = Release|Win32 {9946A048-043B-4F8F-9E07-9297B204714C}.Release|Win32.Build.0 = Release|Win32 - {9EBFE04E-0DEF-469A-957E-126FCBD457C7}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {9EBFE04E-0DEF-469A-957E-126FCBD457C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {9EBFE04E-0DEF-469A-957E-126FCBD457C7}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {9EBFE04E-0DEF-469A-957E-126FCBD457C7}.Debug|Win32.ActiveCfg = Debug|Win32 - {9EBFE04E-0DEF-469A-957E-126FCBD457C7}.Debug|Win32.Build.0 = Debug|Win32 - {9EBFE04E-0DEF-469A-957E-126FCBD457C7}.Release|Any CPU.ActiveCfg = Release|Win32 - {9EBFE04E-0DEF-469A-957E-126FCBD457C7}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {9EBFE04E-0DEF-469A-957E-126FCBD457C7}.Release|Mixed Platforms.Build.0 = Release|Win32 - {9EBFE04E-0DEF-469A-957E-126FCBD457C7}.Release|Win32.ActiveCfg = Release|Win32 - {9EBFE04E-0DEF-469A-957E-126FCBD457C7}.Release|Win32.Build.0 = Release|Win32 {9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Any CPU.ActiveCfg = Debug|Win32 {9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {9F53807E-9382-47BD-8371-E5D04F517E9C}.Debug|Mixed Platforms.Build.0 = Debug|Win32 @@ -2505,6 +2505,7 @@ Global {275F2993-EE9B-4E00-9C85-10A182FD423A} = {2325D8C4-8EF5-42AC-8900-492225750DE4} {27A30967-4BBA-48D1-8522-CDE95F7B1CEC} = {1174D37F-6ABB-45DA-81B3-C631281273B7} {2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} + {2DE20FFA-6F5E-48D9-84D8-09B044A5B119} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE} {2E2D3301-2EC4-4C0F-B889-87073B30F673} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA} {2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357} = {846901FD-A619-4BD5-A303-38174730CDD6} {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E} @@ -2560,7 +2561,6 @@ Global {9055E088-25C6-47FD-87D5-D9DD9FD75C9F} = {1174D37F-6ABB-45DA-81B3-C631281273B7} {9301A569-5D2B-4D11-9332-B1E30AEACB8D} = {97555540-8163-4D0F-BCAC-EFA0FFED3453} {9946A048-043B-4F8F-9E07-9297B204714C} = {873D095E-150E-4262-8C41-2D8ED02F0F57} - {9EBFE04E-0DEF-469A-957E-126FCBD457C7} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE} {9F53807E-9382-47BD-8371-E5D04F517E9C} = {2325D8C4-8EF5-42AC-8900-492225750DE4} {A0D94973-D355-47A5-A1E2-3456F321F010} = {1AFC1EC3-24FA-4260-B099-76319EC9977A} {A1CAA831-C507-4B2E-87F3-AEC63C9907F9} = {1174D37F-6ABB-45DA-81B3-C631281273B7} diff --git a/chrome/test/debugger/debugger_unittests.py b/chrome/test/debugger/debugger_unittests.py index bdf22ea..ae962a0 100644 --- a/chrome/test/debugger/debugger_unittests.py +++ b/chrome/test/debugger/debugger_unittests.py @@ -13,23 +13,23 @@ import google.path_utils import google.process_utils def RunTests(build_dir=None): - '''This is just a simple wrapper for running the test through v8_shell. - Since v8_shell always returns 0 whether the test passes or fails, buildbot - looks at stdout to test for failure. + '''This is just a simple wrapper for running the test through v8_shell_sample. + Since v8_shell_sample always returns 0 whether the test passes or fails, + buildbot looks at stdout to test for failure. ''' script_dir = google.path_utils.ScriptDir() chrome_dir = google.path_utils.FindUpward(script_dir, "chrome") v8_dir = google.path_utils.FindUpward(script_dir, "v8") if build_dir: - v8_shell = os.path.join(build_dir, "v8_shell.exe") + v8_shell_sample = os.path.join(build_dir, "v8_shell_sample.exe") else: - v8_shell = os.path.join(chrome_dir, "Debug", "v8_shell.exe") + v8_shell_sample = os.path.join(chrome_dir, "Debug", "v8_shell_sample.exe") # look for Debug version first - if not os.path.isfile(v8_shell): - v8_shell = os.path.join(chrome_dir, "Release", "v8_shell.exe") - cmd = [v8_shell, - "--allow-natives-syntax", - "--expose-debug-as", "debugContext", # these two are together + if not os.path.isfile(v8_shell_sample): + v8_shell_sample = os.path.join(chrome_dir, "Release", "v8_shell_sample.exe") + runtime_flags = """--allow-natives-syntax --expose-debug-as debugContext""" + cmd = [v8_shell_sample, + "--runtime-flags", runtime_flags, os.path.join(chrome_dir, "browser", "debugger", "resources", "debugger_shell.js"), os.path.join(v8_dir, "tests", "mjsunit.js"), os.path.join(chrome_dir, "test", "debugger", "test_protocol.js") @@ -44,7 +44,7 @@ def RunTests(build_dir=None): if __name__ == "__main__": parser = optparse.OptionParser("usage: %prog [--build_dir=dir]") parser.add_option("", "--build_dir", - help="directory where v8_shell.exe was built") + help="directory where v8_shell_sample.exe was built") (options, args) = parser.parse_args() ret = RunTests(options.build_dir) sys.exit(ret) diff --git a/chrome/test/debugger/test_protocol.js b/chrome/test/debugger/test_protocol.js index 6ca0835..91abbf1 100644 --- a/chrome/test/debugger/test_protocol.js +++ b/chrome/test/debugger/test_protocol.js @@ -5,10 +5,10 @@ * @fileoverview Unit tests for testing debugger protocol betweeen front-end JS * and back-end. * Run with the following command line: - * v8_shell.exe --allow-natives-syntax --expose-debug-as debugContext - * chrome/browser/resources/shell.js - * v8/tests/mjsunit.js - * chrome/test/debugger/test_protocol.js + * v8_shell_sample.exe --allow-natives-syntax --expose-debug-as debugContext + * chrome/browser/resources/shell.js + * v8/tests/mjsunit.js + * chrome/test/debugger/test_protocol.js */ |