---

yaml
---
r: 346865
b: refs/heads/master
c: 9ec0a6c
h: refs/heads/master
i:
  346863: 944dd1d

Author: bob-wilson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 4c487b74583a66c3e0e8509706f2813ab227642c
+refs/heads/master: 9ec0a6cf8039bd87c1a27235f91085be36ce3f9a
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/test/PrintAsObjC/lit.local.cfg

@@ -5,7 +5,7 @@ config.substitutions.insert(0, ('%check-in-clang',
   '%%clang -fsyntax-only -x objective-c-header -fobjc-arc -fmodules '
   '-fmodules-validate-system-headers '
   '-Weverything -Werror -Wno-unused-macros -Wno-incomplete-module '
-  '-Wno-auto-import -Wno-objc-property-assign-on-object-type '
+  '-Wno-auto-import '
   '-F %%clang-importer-sdk-path/frameworks '
   '-I %%clang-include-dir '
   '-isysroot %r/Inputs/clang-importer-sdk' % config.test_source_root) )

trunk/utils/round-trip-syntax-test

@@ -76,12 +76,9 @@ class RoundTripTask(object):
 
         contents = ''.join(map(lambda l: l.decode('utf-8', errors='replace'),
                                open(self.input_filename).readlines()))
-        stdout_contents = self.stdout.decode('utf-8', errors='replace')
-
-        if contents == stdout_contents:
-            return None
-
-        lines = difflib.unified_diff(contents, stdout_contents,
+        lines = difflib.unified_diff(contents,
+                                     self.stdout.decode('utf-8',
+                                                        errors='replace'),
                                      fromfile=self.input_filename,
                                      tofile='-')
         diff = '\n'.join(line for line in lines)