diff --git a/Packages/Distance_3/test/Distance_3/cgal_test b/Packages/Distance_3/test/Distance_3/cgal_test index 07ef9b4f348..bb6e46eb028 100755 --- a/Packages/Distance_3/test/Distance_3/cgal_test +++ b/Packages/Distance_3/test/Distance_3/cgal_test @@ -8,6 +8,7 @@ one_run() goodresult=RESULT/${base}/`basename ${datafile}` if "./${base}" < ${datafile} >output then + cat output >> ProgramOutput.${base}.$PLATFORM if [ -r ${goodresult} ] then if diff output ${goodresult} > /dev/null @@ -79,13 +80,17 @@ fi for file in ${sourcefiles} do base=`basename ${file} .C` + rm -f ProgramOutput.${base}.$PLATFORM + touch -f ProgramOutput.${base}.$PLATFORM datafiles="ls DATA/${base}/ix*" if [ "${datafiles}" ] then + echo "TESTR=1" >> ProgramOutput.${base}.$PLATFORM make_and_execute 1; fi if [ "${datafiles}" ] then + echo "TESTR=2" >> ProgramOutput.${base}.$PLATFORM make_and_execute 2; fi done diff --git a/Packages/Intersections_2/test/Intersections_2/cgal_test b/Packages/Intersections_2/test/Intersections_2/cgal_test index af99e7e7779..81ce507d3d9 100755 --- a/Packages/Intersections_2/test/Intersections_2/cgal_test +++ b/Packages/Intersections_2/test/Intersections_2/cgal_test @@ -8,6 +8,7 @@ one_run() goodresult=RESULT/${base}/`basename ${datafile}` if "./${base}" < ${datafile} >output then + cat output >> ProgramOutput.${base}.$PLATFORM if [ -r ${goodresult} ] then if diff output ${goodresult} > /dev/null @@ -86,14 +87,18 @@ fi for file in ${sourcefiles} do base=`basename ${file} .C` + rm -f ProgramOutput.${base}.$PLATFORM + touch -f ProgramOutput.${base}.$PLATFORM datafiles=`ls DATA/${base}/* 2>/dev/null` if [ "${datafiles}" ] then + echo "TESTR=1" >> ProgramOutput.${base}.$PLATFORM make_and_execute 1; fi # datafiles=`ls DATA/${base}.i.* DATA/${base}.ix.*` if [ "${datafiles}" ] then + echo "TESTR=2" >> ProgramOutput.${base}.$PLATFORM make_and_execute 2; fi done diff --git a/Packages/Intersections_3/test/Intersections_3/cgal_test b/Packages/Intersections_3/test/Intersections_3/cgal_test index 1aab44a84fc..76a7f04e442 100755 --- a/Packages/Intersections_3/test/Intersections_3/cgal_test +++ b/Packages/Intersections_3/test/Intersections_3/cgal_test @@ -9,6 +9,7 @@ one_run() goodresult=RESULT/${base}/`basename ${datafile}` if "./${base}" < ${datafile} >output then + cat output >> ProgramOutput.${base}.$PLATFORM if [ -r ${goodresult} ] then if diff output ${goodresult} > /dev/null @@ -88,6 +89,8 @@ fi for file in ${sourcefiles} do base=`basename ${file} .C` + rm -f ProgramOutput.${base}.$PLATFORM + touch -f ProgramOutput.${base}.$PLATFORM xdatafiles="DATA/${base}.x.*" # idatafiles="DATA/${base}.i.*" # ixdatafiles="DATA/${base}.ix.*" @@ -101,11 +104,13 @@ do fi if [ "${datafiles}" ] then + echo "TESTR=1" >> ProgramOutput.${base}.$PLATFORM make_and_execute 1; fi # datafiles="${xdatafiles} ${ixdatafiles}" if [ "${datafiles}" ] then + echo "TESTR=5" >> ProgramOutput.${base}.$PLATFORM make_and_execute 5; fi done