[cig-commits] [commit] inversion, master, validate_MT_params: fix test script on macos (210427b)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Dec 12 18:29:35 PST 2014
Repository : https://github.com/geodynamics/burnman
On branches: inversion,master,validate_MT_params
Link : https://github.com/geodynamics/burnman/compare/80c2a295c42dfdb38f83f6c1334bf7d8f97a8463...409647ff05dfad6a686198cac1481bd46b5e2e62
>---------------------------------------------------------------
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"
) || {
More information about the CIG-COMMITS
mailing list