Fix _ValidateLists to work when running in linting mode.

webkit/tools/layout_tests/layout_package/test_expectations.py

 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A helper class for reading in and dealing with tests expectations
 for layout tests.
 """
 
 import os
 import re
@@ skipping 101 matching lines @@
     """Read the expectation files for the given filename and return a single
     expectations file with the merged results.
     """
     
     path = os.path.join(self._directory, filename)
     return TestExpectationsFile(path, self._tests, self._platform,
         self._is_debug_mode)
 
   def _ValidateLists(self):
     # Make sure there's no overlap between the tests in the two files.
-    overlap = self._fixable.GetTests() & self._ignored.GetTests()
+    if self._tests:
+      relativizeFilenames = True
+      overlap = self._fixable.GetTests() & self._ignored.GetTests()
+    else:
+      relativizeFilenames = False
+      # If self._tests is None, then we have no way of expanding test paths
+      # So they remain shortened (e.g. LayoutTests/mac doesn't get expanded to
+      # include LayoutTests/mac/foo.html). So find duplicate prefixes
+      # instead of exact matches.
+      overlap = [];
+      for fixableTest in self._fixable.GetTests():
+        for ignoredTest in self._ignored.GetTests():
+          # Add both tests so they both get printed
+          if (fixableTest.startswith(ignoredTest) or 
+              ignoredTest.startswith(fixableTest)):
+            overlap.append(fixableTest)
+            overlap.append(ignoredTest)
+
     message = "Files contained in both " + self.FIXABLE + " and " + self.IGNORED
-    compare_failures.PrintFilesFromSet(overlap, message, sys.stdout)
+    compare_failures.PrintFilesFromSet(overlap, message, sys.stdout,
+        opt_relativizeFilenames=relativizeFilenames)
     assert(len(overlap) == 0)
     # Make sure there are no ignored tests expected to crash.
     assert(len(self._ignored.GetTestsExpectedTo(CRASH)) == 0)
 
 
 def StripComments(line):
   """Strips comments from a line and return None if the line is empty
   or else the contents of line with leading and trailing spaces removed
   and all other whitespace collapsed"""
   
@@ skipping 234 matching lines @@
         self._tests[expectation].add(test)
  
   def _AddSkippedTests(self, tests, is_deferred):
     for test in tests:
       if is_deferred:    
         self._skipped_deferred.add(test)
       self._skipped.add(test)
 
   def _AddError(self, lineno, msg, path):
     self._errors.append('\nLine:%s %s\n%s' % (lineno, msg, path))