From 388664e08ca9578ae075e435e00ecf1ac032ff98 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Tue, 29 Mar 2022 22:15:08 -0400 Subject: tests: Parameterize times --- (limited to 'tests') diff --git a/tests/parse.sh b/tests/parse.sh index a3b1f26..9113cc6 100755 --- a/tests/parse.sh +++ b/tests/parse.sh @@ -21,7 +21,10 @@ set -eu . "${TOP_SRCDIR}/tests/aux/tap-functions.sh" -fmts="$(TZ=UTC0 "${TOP_BUILDDIR}/@" -d '1970-01-01 00:00:00' -F)" +now='1969-12-31 23:59:30' +tgt='1970-01-01 00:00:00' + +fmts="$(TZ=UTC0 "${TOP_BUILDDIR}/@" -d "${tgt}" -F)" time_fmts="$(printf '%s\n' "${fmts}" | \ sed -n '/^Time formats:$/,/^Date formats:$/s/^ \* //p')" date_fmts="$(printf '%s\n' "${fmts}" | \ @@ -44,30 +47,31 @@ for fmt in $(printf '%s\n' "${fmts}"); do diag_ "${fmt}" done -run_test() +test_fmt() { - datetime="${1}" - shift 1 + now="${1}" + tgt="${2}" + fmt="${3}" + shift 3 - got="$(TZ=UTC0 "${TOP_BUILDDIR}/@" -d '1969-12-31 23:59:30' \ - "${datetime}" 2>&1)" || : - if [ x"${got}" = x'1970-01-01 00:00:00' ]; then - ok_ -- "${datetime}" + got="$(TZ=UTC0 "${TOP_BUILDDIR}/@" -d "${now}" "${fmt}" 2>&1)" || : + if [ x"${got}" = x"${tgt}" ]; then + ok_ -- "${fmt}" else - not_ok_ -- "${datetime}" - diag_ " Failed test '${datetime}'" + not_ok_ -- "${fmt}" + diag_ " Failed test '${fmt}'" diag_ " got: '${got}'" - diag_ " expected: '1970-01-01 00:00:00'" + diag_ " expected: '${tgt}'" fi } for time_fmt in ${time_fmts}; do - run_test "${time_fmt}" + test_fmt "${now}" "${tgt}" "${time_fmt}" for date_fmt in ${date_fmts}; do - run_test "${date_fmt} ${time_fmt}" - run_test "${time_fmt} ${date_fmt}" + test_fmt "${now}" "${tgt}" "${date_fmt} ${time_fmt}" + test_fmt "${now}" "${tgt}" "${time_fmt} ${date_fmt}" done done for misc_fmt in ${misc_fmts}; do - run_test "${misc_fmt}" + test_fmt "${now}" "${tgt}" "${misc_fmt}" done -- cgit v0.9.1