From a5228797bff078e2664a74f4248bceadfb218bbf Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Sat, 1 Aug 2009 01:06:22 +0000 Subject: [PATCH] Changes for VC++ compatibility --- Cantera/cxx/demos/NASA_coeffs/runtest | 8 ++++++-- Cantera/cxx/demos/kinetics1/runtest | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Cantera/cxx/demos/NASA_coeffs/runtest b/Cantera/cxx/demos/NASA_coeffs/runtest index cf0c4a43f..7800e0b8f 100755 --- a/Cantera/cxx/demos/NASA_coeffs/runtest +++ b/Cantera/cxx/demos/NASA_coeffs/runtest @@ -2,7 +2,7 @@ # # 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.txt output_a.txt ########################################################################## @@ -28,7 +28,11 @@ then echo "$prog returned with bad status, $retnStat, check output" fi -diff -w output_0_blessed.txt output_0.txt > diff_out_0.txt +${CANTERA_BIN}/exp3to2.sh output_0.txt > output_a.txt +cat output_a.txt | sed /'press any'/d > output.txt + + +diff -w output_0_blessed.txt output.txt > diff_out_0.txt retnStat_0=$? diff --git a/Cantera/cxx/demos/kinetics1/runtest b/Cantera/cxx/demos/kinetics1/runtest index fa7fc82ab..1d50867ef 100755 --- a/Cantera/cxx/demos/kinetics1/runtest +++ b/Cantera/cxx/demos/kinetics1/runtest @@ -2,7 +2,7 @@ # # temp_success="1" -/bin/rm -f output_0.txt kin1.csv diff_csv.txt diff_out_0.txt +/bin/rm -f output_0.txt kin1.csv diff_csv.txt diff_out_0.txt output.txt output_a.txt ########################################################################## @@ -28,7 +28,11 @@ then echo "$prog returned with bad status, $retnStat, check output" fi -diff -w output_0_blessed.txt output_0.txt > diff_out_0.txt +${CANTERA_BIN}/exp3to2.sh output_0.txt > output_a.txt +cat output_a.txt | sed /'press any'/d > output.txt + + +diff -w output_0_blessed.txt output.txt > diff_out_0.txt retnStat_0=$? csvdiff -a 1.0E-20 kin1_blessed_0.csv kin1.csv > diff_csv.txt