[cig-commits] [commit] master: fix test script on macos (210427b)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/burnman

On branch  : master
Link       : https://github.com/geodynamics/burnman/compare/5e9eb1c42d6dd00a30a59872a2b31d1c0f8bd09c...498861c40268a2c440d99f9ba62ccc5ab2a79dfa

>---------------------------------------------------------------

commit 210427b69f4adbd6cc34d6d3c627adcdd43a90ee
Author: Timo Heister <timo.heister at gmail.com>
Date:   Fri Dec 12 16:40:23 2014 -0800

    fix test script on macos


>---------------------------------------------------------------

210427b69f4adbd6cc34d6d3c627adcdd43a90ee
 test.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test.sh b/test.sh
index 78559a6..96ad7a0 100755
--- a/test.sh
+++ b/test.sh
@@ -22,13 +22,13 @@ then
 else
 
   sedthing="s#$fulldir#BURNMAN#g"
-  sed -i'' $sedthing $t.tmp #remove the absolute path from warnings
-  sed -i'' "s/.py:[0-9]*:/.py:/g" $t.tmp #remove line numbers
-  sed -i'' '/UserWarning: findfont: Could not match/d' $t.tmp #remove font warning crap
-  sed -i'' '/UserWarning: findfont: Font family/d' $t.tmp #remove font warning crap
-  sed -i'' '/tight_layout : falling back to Agg renderer/d' $t.tmp #remove font warning crap
-  sed -i'' '/cannot be converted with the encoding. Glyph may be wrong/d' $t.tmp #remove font warning crap
-  sed -i'' '/time old .* time new/d' $t.tmp #remove timing from tests/debye.py
+  sed -i'' -e $sedthing $t.tmp #remove the absolute path from warnings
+  sed -i'' -e "s/.py:[0-9]*:/.py:/g" $t.tmp #remove line numbers
+  sed -i'' -e '/UserWarning: findfont: Could not match/d' $t.tmp #remove font warning crap
+  sed -i'' -e '/UserWarning: findfont: Font family/d' $t.tmp #remove font warning crap
+  sed -i'' -e '/tight_layout : falling back to Agg renderer/d' $t.tmp #remove font warning crap
+  sed -i'' -e '/cannot be converted with the encoding. Glyph may be wrong/d' $t.tmp #remove font warning crap
+  sed -i'' -e '/time old .* time new/d' $t.tmp #remove timing from tests/debye.py
 
   (numdiff -r 1e-6 -s ' \t\n[]' -a 1e-6 -q $t.tmp $fulldir/misc/ref/$t.out >/dev/null && rm $t.tmp && echo "  $t ... ok"
   ) || {