Use a diff that ignores trailing whitespaces to get by some layout test failures.

1 files changed, 1 insertions, 18 deletions

diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java b/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java
index 235e10ee023d..8983612ed8cf 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/LayoutTestsAutoTest.java
@@ -249,28 +249,11 @@ public class LayoutTestsAutoTest extends ActivityInstrumentationTestCase2<TestSh
         File expected = new File(expectedResultFile);
         if (actual.exists() && expected.exists()) {
             try {
-                boolean passing = true;
-                BufferedReader fr = new BufferedReader(new FileReader(actual));
-                BufferedReader fe = new BufferedReader(new FileReader(expected));
-                while (true) {
-                    String s1 = fr.readLine();
-                    String s2 = fe.readLine();
-                    if (s1 == null && s2 == null)
-                        break; // both files are the same
-                    if (s1 == null || s2 == null || !s1.equals(s2)) {
-                        passing = false;
-                        break;
-                    }
-                }
-
-                if (passing) {
+                if (FsUtils.diffIgnoreSpaces(actualResultFile, expectedResultFile)) {
                     passedCase(testFile);
                 } else {
                     failedCase(testFile);
                 }
-
-                fe.close();
-                fr.close();
             } catch (FileNotFoundException ex) {
                 Log.e(LOGTAG, "File not found : " + ex.getMessage());
             } catch (IOException ex) {