From: Carl Worth <cworth@cworth.org>
Date: Thu, 27 May 2010 21:53:51 +0000 (-0700)
Subject: Remove blank lines from output files before comparing.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=baa17c87485b5e776ec142844f5df38a3df9dccc;p=mesa.git

Remove blank lines from output files before comparing.

Recently I'm seeing cases where "gcc -E" mysteriously omits blank
lines, (even though it prints the blank lines in other very similar
cases). Rather than trying to decipher and imitate this, just get rid
of the blank lines.

This approach with sed to kill the lines before the diff is better
than "diff -B" since when there is an actual difference, the presence
of blank lines won't make the diff harder to read.
---

diff --git a/.gitignore b/.gitignore
index d67bd38c93c..b88f0cc75c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ glcpp-parse.h
 *~
 tests/*.expected
 tests/*.gcc
+tests/*.glcpp
 tests/*.out
diff --git a/tests/glcpp-test b/tests/glcpp-test
index bf88d4462e1..92c994979a9 100755
--- a/tests/glcpp-test
+++ b/tests/glcpp-test
@@ -3,8 +3,9 @@ set -e
 
 for test in *.c; do
     echo "Testing $test"
-    ../glcpp < $test > $test.out
+    ../glcpp < $test > $test.glcpp
+    grep -v '^$' < $test.glcpp > $test.out || true
     gcc -E $test -o $test.gcc
-    grep -v '^#' < $test.gcc > $test.expected
-    diff -B -u $test.expected $test.out
+    grep -v '^#' < $test.gcc | grep -v '^$' > $test.expected || true
+    diff -u $test.expected $test.out
 done