From 5c8816a66fbbfb42f1c92b27042714fc2d21f141 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Fri, 17 Jul 2009 20:35:00 +0000 Subject: [PATCH] Corrected errors found doing windows test suite --- .../examples/equilibrium/simple_test/runtest | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Cantera/python/examples/equilibrium/simple_test/runtest b/Cantera/python/examples/equilibrium/simple_test/runtest index e9122d00c..0a49dabfa 100755 --- a/Cantera/python/examples/equilibrium/simple_test/runtest +++ b/Cantera/python/examples/equilibrium/simple_test/runtest @@ -2,7 +2,8 @@ # # temp_success="1" -/bin/rm -f output_0.txt diff_csv.txt diff_out_0.txt +/bin/rm -f output_0.txt diff_csv.txt diff_out_0.txt output_1.txt \ + item0.txt itemp1.txt ########################################################################## prog=simple.py @@ -13,7 +14,7 @@ fi ################################################################# # CANTERA_DATA=${CANTERA_DATA:=../../../data/inputs}; export CANTERA_DATA -CANTERA_BIN=${CANTERA_BIN:=../../../bin} +CANTERA_BIN=${CANTERA_BIN:=../../../../bin} ################################################################# @@ -27,7 +28,14 @@ then echo "$prog returned with bad status, $retnStat, check output" fi -diff -w output_blessed_0.txt output_0.txt > diff_out_0.txt +$CANTERA_BIN/exp3to2.sh output_0.txt > itemp0.txt +cat itemp0.txt | tr -d '\015' | cat > itemp1.txt +/bin/rm itemp0.txt +/bin/mv itemp1.txt output_1.txt + + + +diff -w output_blessed_0.txt output_1.txt > diff_out_0.txt retnStat_0=$?