From: Friedrich Beckmann <friedrich.beckmann@gmx.de>
Date: Sun, 29 Nov 2015 15:45:53 +0000 (+0100)
Subject: osx: Test 172 (decrypt an encrypted syntax file) failed in regression
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26abd623201f0fc5fb55c2314f695c22e1435dce;p=pspp

osx: Test 172 (decrypt an encrypted syntax file) failed in regression

Test 172 decrypts a file which produces some problematic CRLF characters.
The characters are removed with sed to check vs. reference data, but the sed
does not work the same way on osx as on linux. I changed this to tr which
works on both systems.
---

diff --git a/tests/data/encrypted-file.at b/tests/data/encrypted-file.at
index 241e4e59bb..15a5ce219e 100644
--- a/tests/data/encrypted-file.at
+++ b/tests/data/encrypted-file.at
@@ -32,7 +32,7 @@ AT_CHECK([pspp-convert $srcdir/data/test-encrypted.sps test.sps -p password])
 
 # The sample file is not ideal: lines end in CRLF and its last line
 # lacks a new-line, so "sed" and "echo" make it easier to work with.
-AT_CHECK([sed 's/
//' test.sps; echo], [0], [dnl
+AT_CHECK([tr -d "\r" < test.sps; echo], [0], [dnl
 * Encoding: windows-1252.
 DATA LIST LIST /name (a25) quantity (f8).
 BEGIN DATA.