Remove the -win/_win from the test file names since they really aren't windows

  specific and it seems to confuse new folks from time to time.
Review URL: http://codereview.chromium.org/18812

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8654 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 22 insertions, 22 deletions

diff --git a/webkit/tools/layout_tests/layout_package/test_failures.py b/webkit/tools/layout_tests/layout_package/test_failures.py
index 134f2e3..a6abb16 100644
--- a/webkit/tools/layout_tests/layout_package/test_failures.py
+++ b/webkit/tools/layout_tests/layout_package/test_failures.py
@@ -118,7 +118,7 @@ class FailureCrash(TestFailure):
 
 class FailureMissingResult(FailureWithType):
   """Expected result was missing."""
-  OUT_FILENAMES = ["-actual-win.txt"]
+  OUT_FILENAMES = ["-actual.txt"]
 
   @staticmethod
   def Message():
@@ -132,9 +132,9 @@ class FailureMissingResult(FailureWithType):
 class FailureTextMismatch(FailureWithType):
   """Text diff output failed."""
   # Filename suffixes used by ResultHtmlOutput.
-  OUT_FILENAMES = ["-actual-win.txt", "-expected.txt", "-diff-win.txt"]
-  OUT_FILENAMES_WDIFF = ["-actual-win.txt", "-expected.txt", "-diff-win.txt",
-                         "-wdiff-win.html"]
+  OUT_FILENAMES = ["-actual.txt", "-expected.txt", "-diff.txt"]
+  OUT_FILENAMES_WDIFF = ["-actual.txt", "-expected.txt", "-diff.txt",
+                         "-wdiff.html"]
 
   def __init__(self, test_type, has_wdiff):
     FailureWithType.__init__(self, test_type)
@@ -154,8 +154,8 @@ class FailureSimplifiedTextMismatch(FailureTextMismatch):
   with the FailureTextMismatch class.
   """
 
-  OUT_FILENAMES = ["-simp-actual-win.txt", "-simp-expected.txt",
-                   "-simp-diff-win.txt"]
+  OUT_FILENAMES = ["-simp-actual.txt", "-simp-expected.txt",
+                   "-simp-diff.txt"]
   def __init__(self, test_type):
     # Don't run wdiff on simplified text diffs.
     FailureTextMismatch.__init__(self, test_type, False)
@@ -181,7 +181,7 @@ class FailureMissingImageHash(FailureWithType):
 
 class FailureMissingImage(FailureWithType):
   """Actual result image was missing."""
-  OUT_FILENAMES = ["-actual-win.png"]
+  OUT_FILENAMES = ["-actual.png"]
 
   @staticmethod
   def Message():
@@ -194,7 +194,7 @@ class FailureMissingImage(FailureWithType):
 
 class FailureImageHashMismatch(FailureWithType):
   """Image hashes didn't match."""
-  OUT_FILENAMES = ["-actual-win.png", "-expected.png", "-diff-win.png"]
+  OUT_FILENAMES = ["-actual.png", "-expected.png", "-diff.png"]
 
   @staticmethod
   def Message():
@@ -204,7 +204,7 @@ class FailureImageHashMismatch(FailureWithType):
 
 class FailureFuzzyFailure(FailureWithType):
   """Image hashes didn't match."""
-  OUT_FILENAMES = ["-actual-win.png", "-expected.png"]
+  OUT_FILENAMES = ["-actual.png", "-expected.png"]
 
   @staticmethod
   def Message():
diff --git a/webkit/tools/layout_tests/test_types/image_diff.py b/webkit/tools/layout_tests/test_types/image_diff.py
index 077e0c4..e80dcb8 100644
--- a/webkit/tools/layout_tests/test_types/image_diff.py
+++ b/webkit/tools/layout_tests/test_types/image_diff.py
@@ -34,7 +34,7 @@ class ImageDiff(test_type_base.TestTypeBase):
       expected_png: path to the expected result file
     """
     self._MakeOutputDirectory(filename)
-    actual_filename = self.OutputFilename(filename, "-actual-win.png")
+    actual_filename = self.OutputFilename(filename, "-actual.png")
     expected_filename = self.OutputFilename(filename, "-expected.png")
 
     shutil.copyfile(actual_png, actual_filename)
@@ -70,7 +70,7 @@ class ImageDiff(test_type_base.TestTypeBase):
       self.FILENAME_SUFFIX_COMPARE)
     actual_filename = self.OutputFilename(filename,
       self.FILENAME_SUFFIX_ACTUAL + '.png')
-    expected_win_filename = self.OutputFilename(filename,
+    expected_filename = self.OutputFilename(filename,
       self.FILENAME_SUFFIX_EXPECTED + '.png')
     platform_util = platform_utils.PlatformUtility('')
 
@@ -79,7 +79,7 @@ class ImageDiff(test_type_base.TestTypeBase):
 
     try:
       executable = platform_util.ImageCompareExecutablePath(target)
-      cmd = [executable, '--diff', actual_filename, expected_win_filename,
+      cmd = [executable, '--diff', actual_filename, expected_filename,
              diff_filename]
     except Exception, e:
       _compare_available = False
diff --git a/webkit/tools/layout_tests/test_types/test_type_base.py b/webkit/tools/layout_tests/test_types/test_type_base.py
index 7750b6e..0c92cbf 100644
--- a/webkit/tools/layout_tests/test_types/test_type_base.py
+++ b/webkit/tools/layout_tests/test_types/test_type_base.py
@@ -42,11 +42,11 @@ _wdiff_available = True
 
 class TestTypeBase(object):
   # Filename pieces when writing failures to the test results directory.
-  FILENAME_SUFFIX_ACTUAL = "-actual-win"
+  FILENAME_SUFFIX_ACTUAL = "-actual"
   FILENAME_SUFFIX_EXPECTED = "-expected"
-  FILENAME_SUFFIX_DIFF = "-diff-win"
-  FILENAME_SUFFIX_WDIFF = "-wdiff-win.html"
-  FILENAME_SUFFIX_COMPARE = "-diff-win.png"
+  FILENAME_SUFFIX_DIFF = "-diff"
+  FILENAME_SUFFIX_WDIFF = "-wdiff.html"
+  FILENAME_SUFFIX_COMPARE = "-diff.png"
 
   def __init__(self, platform, root_output_dir):
     """Initialize a TestTypeBase object.
@@ -143,9 +143,9 @@ class TestTypeBase(object):
     between the two to files in the results directory.
 
     The full output filename of the actual, for example, will be
-      <filename><test_type>-actual-win<file_type>
+      <filename><test_type>-actual<file_type>
     For instance,
-      my_test-simp-actual-win.txt
+      my_test-simp-actual.txt
 
     Args:
       filename: The test filename
@@ -160,15 +160,15 @@ class TestTypeBase(object):
     self._MakeOutputDirectory(filename)
     actual_filename = self.OutputFilename(filename,
                       test_type + self.FILENAME_SUFFIX_ACTUAL + file_type)
-    expected_win_filename = self.OutputFilename(filename,
+    expected_filename = self.OutputFilename(filename,
                       test_type + self.FILENAME_SUFFIX_EXPECTED + file_type)
     open(actual_filename, "wb").write(output)
-    open(expected_win_filename, "wb").write(expected)
+    open(expected_filename, "wb").write(expected)
 
     if diff:
       diff = difflib.unified_diff(expected.splitlines(True),
                                   output.splitlines(True),
-                                  expected_win_filename,
+                                  expected_filename,
                                   actual_filename)
 
       diff_filename = self.OutputFilename(filename,
@@ -182,7 +182,7 @@ class TestTypeBase(object):
       cmd = [executable,
              '--start-delete=##WDIFF_DEL##', '--end-delete=##WDIFF_END##',
              '--start-insert=##WDIFF_ADD##', '--end-insert=##WDIFF_END##',
-             actual_filename, expected_win_filename]
+             actual_filename, expected_filename]
       filename = self.OutputFilename(filename,
                       test_type + self.FILENAME_SUFFIX_WDIFF)