diff --git a/programs/dxf.test.in b/programs/dxf.test.in index 884ff5b9b..b7caf31b8 100755 --- a/programs/dxf.test.in +++ b/programs/dxf.test.in @@ -204,8 +204,10 @@ check_roundtrip() { expect="$(grep -E '^Add entity' "$log1" | grep -c -v 'entity UNKNOWN_ENT')" fi else - if [ "$log1" = "example_r13.log1" ]; then - expect="$(grep -E '^Add entity' "$log1" | grep -E -c -v 'entity (WIPEOUT|ARC_DIMENSION|HELIX|UNKNOWN_ENT|LIGHT)')" + if [ "$log1" = "example_r14.log1" ]; then + expect="$(grep -E '^Add entity' "$log1" | grep -E -c -v 'entity (WIPEOUT|ARC_DIMENSION|HELIX|UNKNOWN_ENT|LIGHT|MULTILEADER)')" + elif [ "$log1" = "example_r13.log1" ]; then + expect="$(grep -E '^Add entity' "$log1" | grep -E -c -v 'entity (WIPEOUT|ARC_DIMENSION|HELIX|UNKNOWN_ENT|LIGHT|MINSERT)')" else expect="$(grep -E '^Add entity' "$log1" | grep -E -c -v 'entity (WIPEOUT|ARC_DIMENSION|HELIX|UNKNOWN_ENT)')" fi @@ -217,7 +219,7 @@ check_roundtrip() { echo "$dxf" roundtrip ok rm "$log1" "$log2" 2>/dev/null else - echo "$dxf" "roundtrip fail: expect $expect, got $got entities" + echo "$dwg" "dxf roundtrip fail: expect $expect, got $got entities" i=$((i+1)) echo "expect=$expect" >"$log" echo "got=$got" >>"$log" @@ -264,8 +266,7 @@ do check_insert_order done -# r14 fails on MINSERT -for year in 2000 2004 2007 2010 2013 2018 r13 # r14 +for year in 2000 2004 2007 2010 2013 2018 r13 r14 do base=example dwg="$DATADIR/${base}_${year}.dwg" @@ -274,13 +275,13 @@ do rm "./$log" 2>/dev/null check_roundtrip done -#for d in r11/ACEB10 r11/entities-2d r10/entities r9/entities r2.10/entities \ -# r2.6/entities r1.4/entities +# FIXME +#for d in r11/ACEB10 r11/entities-2d r10/entities r9/entities r2.10/entities r2.6/entities #do # base="$(basename $d)" -# year="$(dirname $d)" +# rel="$(dirname $d)" # dwg="$DATADIR/$d.dwg" -# tgt="../${base}_${year}" +# tgt="../${base}_${rel}" # log="$tgt.dxf.log" # rm "./$log" 2>/dev/null # check_roundtrip