diff options
Diffstat (limited to 'contrib/libxo/tests/core/Makefile.am')
| -rw-r--r-- | contrib/libxo/tests/core/Makefile.am | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/contrib/libxo/tests/core/Makefile.am b/contrib/libxo/tests/core/Makefile.am index 7e61f55..7f19472 100644 --- a/contrib/libxo/tests/core/Makefile.am +++ b/contrib/libxo/tests/core/Makefile.am @@ -66,7 +66,9 @@ EXTRA_DIST = \ ${addprefix saved/, ${TEST_CASES:.c=.H.err}} \ ${addprefix saved/, ${TEST_CASES:.c=.H.out}} \ ${addprefix saved/, ${TEST_CASES:.c=.HIPx.err}} \ - ${addprefix saved/, ${TEST_CASES:.c=.HIPx.out}} + ${addprefix saved/, ${TEST_CASES:.c=.HIPx.out}} \ + ${addprefix saved/, ${TEST_CASES:.c=.E.err}} \ + ${addprefix saved/, ${TEST_CASES:.c=.E.out}} S2O = | ${SED} '1,/@@/d' @@ -79,17 +81,11 @@ valgrind: #TEST_TRACE = set -x ; TEST_JIG = \ - ${CHECKER} ./$$base.test ${TEST_OPTS} \ + ${CHECKER} ./$$base.test --libxo$$xoopts ${TEST_OPTS} \ > out/$$base.$$fmt.out 2> out/$$base.$$fmt.err ; \ ${DIFF} -Nu ${srcdir}/saved/$$base.$$fmt.out out/$$base.$$fmt.out ${S2O} ; \ ${DIFF} -Nu ${srcdir}/saved/$$base.$$fmt.err out/$$base.$$fmt.err ${S2O} -TEST_ONE = \ - LIBXO_OPTIONS=:W$$fmt ${TEST_JIG} - -TEST_TWO = \ - LIBXO_OPTIONS=warn,encoder=test ${TEST_JIG} - TEST_FORMATS = T XP JP HP X J H HIPx test tests: ${bin_PROGRAMS} @@ -98,12 +94,14 @@ test tests: ${bin_PROGRAMS} base=`${BASENAME} $$test .c` ; \ (for fmt in ${TEST_FORMATS}; do \ echo "... $$test ... $$fmt ..."; \ - ${TEST_ONE}; \ + xoopts=:W$$fmt ; \ + ${TEST_JIG}; \ true; \ done) ; \ (for fmt in E; do \ echo "... $$test ... $$fmt ..."; \ - ${TEST_TWO}; \ + xoopts==warn,encoder=test ; \ + ${TEST_JIG}; \ true; \ done) \ done) |
