406a584d7e
from 1.0.0:
Add "continuation" flag, to allow multiple "xo" invocations in a single line of output (#58)
Add --top-wrap to make top-level JSON wrappers
Add --{open,close}-{list,instace} options
Add xo_xml_leader(), to detect use of some bogus XML tags. It's still bad form, but it's a little safer now
Avoid call to xo_write before xo_flush, since the latter calls the former
Check return code from xo_flush_h properly (<0) (FreeBSD Bug 236935)
For JSON output, avoid newline before a container's close brace (#62)
Merge branch 'text_only' of https://github.com/zvr/libxo into zvr-text_only
Use XO_USE_INT_RETURN_CODES, not USE_INT_RETURN_CODES
add docs for --continuation
add docs for --not-first
call xo_state_set_flags before values and close containers; add XOIF_MADE_OUTPUT flag to track state; make proper empty JSON objects in xo_finish
color_map code has to be #ifdef'd out, since the struct definition
correct xo_flush_func_t (doesn't use xo_ssize_t)
make depth change for --top-wrap only for JSON
fix to handle --top-wrap in "xo" by being more consistent with handling trailing newlines
fix to handle text-only version #64 (from zvr)
fix xo_buf_has_room for round up to the next XO_BUFSIZ, not just add XO_BUFSIZ to the size (FreeBSD Bug 236937)
update docs for new "xo" options
update functions to use xo_ssize_t
update test cases
from 1.0.1:
Add EINTEGRITY to .pot files under test/gettext/ (fix from FreeBSD)
from 1.0.2:
handle failure from xo_vnsprintf; don't add -1 to "rc"
PR: 236937, 236935
Submitted by: phil
Reported by: Alfonso S. Siciliano <alfix86@gmail.com>
MFC after: 2 weeks
84 lines
2.5 KiB
Makefile
84 lines
2.5 KiB
Makefile
#
|
|
# $Id$
|
|
#
|
|
# Copyright 2014, Juniper Networks, Inc.
|
|
# All rights reserved.
|
|
# This SOFTWARE is licensed under the LICENSE provided in the
|
|
# ../Copyright file. By downloading, installing, copying, or otherwise
|
|
# using the SOFTWARE, you agree to be bound by the terms of that
|
|
# LICENSE.
|
|
|
|
AM_CFLAGS = -I${top_srcdir} -I${top_srcdir}/libxo
|
|
|
|
# Ick: maintained by hand!
|
|
TEST_CASES = \
|
|
xo_01.sh \
|
|
xo_02.sh
|
|
|
|
# TEST_CASES := $(shell cd ${srcdir} ; echo *.c )
|
|
|
|
EXTRA_DIST = \
|
|
${TEST_CASES} \
|
|
${addprefix saved/, ${TEST_CASES:.sh=.T.err}} \
|
|
${addprefix saved/, ${TEST_CASES:.sh=.T.out}} \
|
|
${addprefix saved/, ${TEST_CASES:.sh=.XP.err}} \
|
|
${addprefix saved/, ${TEST_CASES:.sh=.XP.out}} \
|
|
${addprefix saved/, ${TEST_CASES:.sh=.JP.err}} \
|
|
${addprefix saved/, ${TEST_CASES:.sh=.JP.out}} \
|
|
${addprefix saved/, ${TEST_CASES:.sh=.HP.err}} \
|
|
${addprefix saved/, ${TEST_CASES:.sh=.HP.out}} \
|
|
${addprefix saved/, ${TEST_CASES:.sh=.X.err}} \
|
|
${addprefix saved/, ${TEST_CASES:.sh=.X.out}} \
|
|
${addprefix saved/, ${TEST_CASES:.sh=.J.err}} \
|
|
${addprefix saved/, ${TEST_CASES:.sh=.J.out}} \
|
|
${addprefix saved/, ${TEST_CASES:.sh=.H.err}} \
|
|
${addprefix saved/, ${TEST_CASES:.sh=.H.out}} \
|
|
${addprefix saved/, ${TEST_CASES:.sh=.HIPx.err}} \
|
|
${addprefix saved/, ${TEST_CASES:.sh=.HIPx.out}}
|
|
|
|
S2O = | ${SED} '1,/@@/d'
|
|
|
|
all:
|
|
|
|
#TEST_TRACE = set -x ;
|
|
|
|
XO=../../xo/xo
|
|
|
|
TEST_ONE = \
|
|
${CHECKER} sh ${srcdir}/$$base.sh "${XO} --libxo:W$$fmt" ${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_FORMATS = T XP JP HP X J H HIPx
|
|
|
|
test tests: ${bin_PROGRAMS}
|
|
@${MKDIR} -p out
|
|
-@ ${TEST_TRACE} (for test in ${TEST_CASES} ; do \
|
|
base=`${BASENAME} $$test .sh` ; \
|
|
(for fmt in ${TEST_FORMATS}; do \
|
|
echo "... $$test ... $$fmt ..."; \
|
|
${TEST_ONE}; \
|
|
true; \
|
|
done) \
|
|
done)
|
|
|
|
one:
|
|
-@(test=${TEST_CASE}; data=${TEST_DATA}; ${TEST_ONE} ; true)
|
|
|
|
accept:
|
|
-@(for test in ${TEST_CASES} ; do \
|
|
base=`${BASENAME} $$test .sh` ; \
|
|
(for fmt in ${TEST_FORMATS}; do \
|
|
echo "... $$test ... $$fmt ..."; \
|
|
${CP} out/$$base.$$fmt.out ${srcdir}/saved/$$base.$$fmt.out ; \
|
|
${CP} out/$$base.$$fmt.err ${srcdir}/saved/$$base.$$fmt.err ; \
|
|
done) \
|
|
done)
|
|
|
|
CLEANFILES =
|
|
CLEANDIRS = out
|
|
|
|
clean-local:
|
|
rm -rf ${CLEANDIRS}
|