summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/test_shell_main.cc
diff options
context:
space:
mode:
authordpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-15 11:22:08 +0000
committerdpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-15 11:22:08 +0000
commita6f020c0d62ab86638214a9d9c2449c87461880f (patch)
tree5bc59a32b7b08e8352cb2156318d05d622eecca0 /webkit/tools/test_shell/test_shell_main.cc
parent855abcba04fa69a7e307c8f1913cd1b549911952 (diff)
downloadchromium_src-a6f020c0d62ab86638214a9d9c2449c87461880f.zip
chromium_src-a6f020c0d62ab86638214a9d9c2449c87461880f.tar.gz
chromium_src-a6f020c0d62ab86638214a9d9c2449c87461880f.tar.bz2
Enable the ability to run layout tests on Vista as well as XP. See the note
sent to chromium-dev for more info. This change changes test_shell to use --generic-theme when --layout-tests is specified. Also, two new platform directories have been added for baselines, chromium-win-xp and chromium-win-vista. chromium-win-vista should be empty (it just needs to exist for run_webkit_tests.py to function properly), and chromium-win-xp should contain only XP-specific baselines. In addition to this change, we will commit a new set of baselines directly using svn (rather than going through Rietveld). R=TBD BUG=none TEST=none Review URL: http://codereview.chromium.org/203065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26203 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell_main.cc')
-rw-r--r--webkit/tools/test_shell/test_shell_main.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index ff280f4..2df6647b 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -79,10 +79,10 @@ int main(int argc, char* argv[]) {
bool layout_test_mode =
parsed_command_line.HasSwitch(test_shell::kLayoutTests);
bool ux_theme = parsed_command_line.HasSwitch(test_shell::kUxTheme);
- bool generic_theme =
- parsed_command_line.HasSwitch(test_shell::kGenericTheme);
- bool classic_theme = (layout_test_mode && !ux_theme && !generic_theme) ||
+ bool classic_theme =
parsed_command_line.HasSwitch(test_shell::kClassicTheme);
+ bool generic_theme = (layout_test_mode && !ux_theme && !classic_theme) ||
+ parsed_command_line.HasSwitch(test_shell::kGenericTheme);
bool enable_gp_fault_error_box = false;
enable_gp_fault_error_box =