Project

General

Profile

« Previous | Next » 

Revision 322

test/map: Abort tester on failed diff

View differences:

test/map
31 31
function fromFile()
32 32
{
33 33
    (_in="$in"; trace)
34
    ("$@" <"$in") || exit # run in a sandbox; abort tester if error
34
    ("$@" <"$in") || exit # run in a sandbox
35 35
}
36 36

  
37 37
function map()
......
65 65
            else fromFile "$@"
66 66
            fi
67 67
        } || exit
68
    done) || exit # run in a sandbox; abort tester if error
68
    done) || exit # run in a sandbox
69 69
}
70 70

  
71 71
function toXml()
......
73 73
    local stem="$orig_src.$table.$out_fmt"
74 74
    local out="output/$stem${method+.$method}.xml"
75 75
    local accepted="accepted_output/$stem.xml"
76
    (set -x; ../map "$map" >"$out") || exit # abort tester
77
    (set -x; ${testMode:+diff "$accepted" "$out"})
78
    true # ignore last command's exit status
76
    (set -x; ../map "$map" >"$out") || exit
77
    (set -x; ${testMode:+diff "$accepted" "$out"}) || exit
79 78
}
80 79

  
81 80
vegbienDest=../bin/vegbien_dest
......
83 82
function toDb()
84 83
{
85 84
    trace . "$vegbienDest"
86
    (. "$vegbienDest"; set -x; ../map ${map:+"$map"}) || exit # abort tester
85
    (. "$vegbienDest"; set -x; ../map ${map:+"$map"}) || exit
87 86
}
88 87

  
89 88
for in in input/*; do

Also available in: Unified diff