From ff03ab4f56acecb286c6caf42d4acdc95925ecf7 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 5 Dec 2014 10:25:33 +0100 Subject: [PATCH] work around BSD sed not interpreting \r in s/$/\r/ * src/kripketest/bad_parsing.test, src/tgbatest/neverclaimread.test, src/tgbatest/readsave.test: Use Perl for the unix2dos conversion. --- src/kripketest/bad_parsing.test | 2 +- src/tgbatest/neverclaimread.test | 2 +- src/tgbatest/readsave.test | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/kripketest/bad_parsing.test b/src/kripketest/bad_parsing.test index 1e5ca5541..d1d967174 100755 --- a/src/kripketest/bad_parsing.test +++ b/src/kripketest/bad_parsing.test @@ -68,7 +68,7 @@ cat output | grep -v + > res diff expected res # The diagnostic should be the same with DOS return lines -sed 's/$/\r/' input > input.dos +perl -pe 's/$/\r/' input > input.dos mv input.dos input run 1 ../parse_print input 2> output cat output | grep -v + > res diff --git a/src/tgbatest/neverclaimread.test b/src/tgbatest/neverclaimread.test index d56b9cfde..195b31a45 100755 --- a/src/tgbatest/neverclaimread.test +++ b/src/tgbatest/neverclaimread.test @@ -288,7 +288,7 @@ grep input: stderr > stderrfilt diff stderrfilt expected-err # DOS-style new lines should have the same output. -sed 's/$/\r/g' input > input.dos +perl -pe 's/$/\r/' input > input.dos mv input.dos input run 2 ../ltl2tgba -ks -XN input > stdout 2>stderr cat stderr diff --git a/src/tgbatest/readsave.test b/src/tgbatest/readsave.test index 432a8e670..9e4a0db7a 100755 --- a/src/tgbatest/readsave.test +++ b/src/tgbatest/readsave.test @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2009, 2010, 2012 Laboratoire de Recherche et Développement -# de l'Epita (LRDE). +# Copyright (C) 2009, 2010, 2012, 2014 Laboratoire de Recherche et +# Développement de l'Epita (LRDE). # Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6), # département Systèmes Répartis Coopératifs (SRC), Université Pierre # et Marie Curie. @@ -116,7 +116,7 @@ EOF diff stderrfilt expected # The diagnostic should be the same with DOS input -sed 's/$/\r/' input > input.dos +perl -pe 's/$/\r/' input > input.dos mv input.dos input run 2 ../ltl2tgba -b -X input > stdout 2>stderr cat stderr