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

3 files changed, 16 insertions, 4 deletions

diff --git a/webkit/tools/layout_tests/layout_package/platform_utils_win.py b/webkit/tools/layout_tests/layout_package/platform_utils_win.py
index 8c8d508..7e44afc 100644
--- a/webkit/tools/layout_tests/layout_package/platform_utils_win.py
+++ b/webkit/tools/layout_tests/layout_package/platform_utils_win.py
@@ -20,7 +20,9 @@ def PlatformVersion():
   '-snowleopard'. If the platform does not distinguish between
   minor versions, it returns ''."""
   winver = sys.getwindowsversion()
-  if winver[0] == 5 and (winver[1] == 1 or winver[1] == 2):
+  if winver[0] == 6 and (winver[1] == 0):
+    return '-vista'
+  elif winver[0] == 5 and (winver[1] == 1 or winver[1] == 2):
     return '-xp'
   return ''
 
@@ -28,6 +30,8 @@ def BaselineSearchPath():
   """Returns the list of directories to search for baselines/results, in
   order of preference. Paths are relative to the top of the source tree."""
   dirs = []
+  if PlatformVersion() in ("-vista", "-xp"):
+    dirs.append(path_utils.ChromiumBaselinePath('chromium-win-vista'))
   if PlatformVersion() == "-xp":
     dirs.append(path_utils.ChromiumBaselinePath('chromium-win-xp'))
   dirs.append(path_utils.ChromiumBaselinePath('chromium-win'))
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index c076e7f..0b1fbad 100755
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2321,3 +2321,11 @@ BUG21841 : LayoutTests/plugins/destroy-during-npp-new.html = FAIL
 
 // missing upstream baseline from 48368
 BUG21842 SKIP WIN LINUX : LayoutTests/platform/win/accessibility/scroll-to-anchor.html = FAIL
+
+BUG21859 WIN-VISTA : LayoutTests/fast/css/css2-system-fonts.html = FAIL
+BUG21859 WIN : LayoutTests/fast/forms/search-styled.html = FAIL
+BUG21859 WIN-VISTA : LayoutTests/fast/text/whitespace/026.html = FAIL
+BUG21859 WIN-VISTA : LayoutTests/fast/text/basic/006.html = FAIL
+BUG21859 WIN-XP : LayoutTests/fast/text/line-breaks.html = FAIL
+BUG21859 WIN : LayoutTests/fast/overflow/overflow-float-stacking.html = FAIL
+BUG21859 WIN : LayoutTests/tables/mozilla/bugs/bug96343.html = FAIL
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 =