3 files changed, 13 insertions, 6 deletions
diff --git a/webkit/tools/layout_tests/layout_package/compare_failures.py b/webkit/tools/layout_tests/layout_package/compare_failures.py
index f47a061..28efeb6 100644
--- a/webkit/tools/layout_tests/layout_package/compare_failures.py
+++ b/webkit/tools/layout_tests/layout_package/compare_failures.py
@@ -137,7 +137,9 @@ class CompareFailures:
         if not test_expectations.CRASH in expectations: crashes.add(test)
       elif is_hang:
         if not test_expectations.TIMEOUT in expectations: hangs.add(test)
-      elif is_missing:
+      # Do not add to the missing list if a test is rebaselining and missing
+      # expected files.
+      elif is_missing and not self._expectations.IsRebaselining(test):
         missing.add(test)
       elif is_failure:
         if not test_expectations.FAIL in expectations: failures.add(test)
diff --git a/webkit/tools/layout_tests/layout_package/test_expectations.py b/webkit/tools/layout_tests/layout_package/test_expectations.py
index 3f1feb6..0df9092 100644
--- a/webkit/tools/layout_tests/layout_package/test_expectations.py
+++ b/webkit/tools/layout_tests/layout_package/test_expectations.py
@@ -121,6 +121,9 @@ class TestExpectations:
   def IsIgnored(self, test):
     return self._expected_failures.HasModifier(test, WONTFIX)
 
+  def IsRebaselining(self, test):
+    return self._expected_failures.HasModifier(test, REBASELINE)
+
   def HasModifier(self, test, modifier):
     return self._expected_failures.HasModifier(test, modifier)
 
diff --git a/webkit/tools/layout_tests/rebaseline.py b/webkit/tools/layout_tests/rebaseline.py
index 5e6e48d..456852b 100644
--- a/webkit/tools/layout_tests/rebaseline.py
+++ b/webkit/tools/layout_tests/rebaseline.py
@@ -348,19 +348,21 @@ class Rebaseliner(object):
       False otherwise.
     """
 
-    output = RunShell(['svn', 'status', filename], False)
-    logging.debug('  Svn status output: "%s"', output)
+    status_output = RunShell(['svn', 'status', filename], False)
+    output = status_output.upper()
     if output.startswith('A') or output.startswith('M'):
       logging.info('  File already added to SVN: "%s"', filename)
       return True
 
-    output = RunShell(['svn', 'add', filename], True)
-    logging.debug('  Svn add output: "%s"', output)
-    if output.startswith('A') and output.endswith(filename):
+    add_output = RunShell(['svn', 'add', filename], True)
+    output = add_output.upper().rstrip()
+    if output.startswith('A') and output.endswith(filename.upper()):
       logging.info('  Added new file: "%s"', filename)
       return True
 
     logging.warn('  Failed to add file to SVN: "%s"', filename)
+    logging.warn('  Svn status output: "%s"', status_output)
+    logging.warn('  Svn add output: "%s"', add_output)
     return False