Changeset 494bf6


Ignore:
Timestamp:
May 15, 2010, 10:14:44 PM (15 years ago)
Author:
Frederik Heber <heber@…>
Children:
f3adfe
Parents:
2e06c4 (diff), 2b0041 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'FixTesselationTestDiff' into CommandLineActionMapping

File:
1 edited

Legend:

Unmodified
Added
Removed

  • molecuilder/tests/Tesselations/defs.in

    r2e06c4 r494bf6  
    6262        #cat stderr
    6363        #cat stdout
    64         diff ${FILENAME}.dat ../@srcdir@/$mol/$2/${FILENAME}-$mol.dat 2>diffstderr >diffstdout || exitcode=$?
     64        grep -E "^[0-9]* [0-9]* [0-9]*$" ../../../../../molecuilder/tests/Tesselations/$mol/$2/${FILENAME}-$mol.dat | sort -n >reference-triangles.dat
     65        grep -E "^[0-9]* [0-9]* [0-9]*$" ${FILENAME}.dat | sort -n >new-triangles.dat
     66        diff reference-triangles.dat new-triangles.dat 2>diffstderr >diffstdout || exitcode=$?
    6567        #echo "Diff done with exitcode $exitcode."
    6668        #cat diffstderr
Note: See TracChangeset for help on using the changeset viewer.