From: Gurucharan Shetty <gshetty@nicira.com>
Date: Fri, 18 Apr 2014 16:00:46 +0000 (-0700)
Subject: testsuite.at: Workaround for carriage returns on windows.
X-Git-Tag: sliver-openvswitch-2.2.90-1~3^2~93
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=0d21340a5a1e26bba46522ba4666033564f8e930

testsuite.at: Workaround for carriage returns on windows.

In unit tests, we compare text written in logs or stdout/stderr
to figure out the success or failure of tests. In Windows,
since new line is represented by CR+LF, autoconf tests run in
MinGW environment fail.

Asking diff to ignore trailing carriage returns is one way
to solve the problem

Suggested-by: Ben Pfaff <blp@nicira.com>
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 85c50d137..264a15fd6 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -47,6 +47,10 @@ if test "$IS_WIN32" = "yes"; then
         command pwd -W "$@"
     }
 
+    diff () {
+        command diff --strip-trailing-cr "$@"
+    }
+
     kill () {
         case "$1" in
             -0)