From: Gisle Vanem <gvanem@yahoo.no>
Date: Fri, 9 Jan 2015 13:39:39 +0000 (+0000)
Subject: condition DOS/UNIX newline styles for Windows test
X-Git-Tag: tcpdump-4.7.2~1^2~45
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/6802dd63c5a2ef2758c7aeae6f7343232a77ed57?hp=99ee702977aa759ce3bd4c11b1592cae2d4e58aa

condition DOS/UNIX newline styles for Windows test
---

diff --git a/tests/TESTonce b/tests/TESTonce
index 7e55d24a..fc6931e8 100755
--- a/tests/TESTonce
+++ b/tests/TESTonce
@@ -13,8 +13,8 @@ $output=$ARGV[2];
 $options=$ARGV[3];
 
 if ($^O eq 'MSWin32') {
-  $r = system "..\\windump -n -r $input $options 2>NUL | tee NEW/$output | diff $output - >DIFF/$output.diff";
- }
+  $r = system "..\\windump -n -r $input $options 2>NUL | sed 's/\\r//' | tee NEW/$output | diff $output - >DIFF/$output.diff";
+}
 else {
   $r = system "../tcpdump 2>/dev/null -n -r $input $options | tee NEW/$output | diff $output - >DIFF/$output.diff";
 }