diff options
author | Karel Zak | 2018-02-02 10:31:24 +0100 |
---|---|---|
committer | Karel Zak | 2018-02-02 10:31:24 +0100 |
commit | f3932a6bb5c84fa27041fa8331b44e85a0827b91 (patch) | |
tree | ec7c8810cb6639e2766e10ab2b298c5a3fddf22d /tests/ts/cal | |
parent | tests: use TS_HELPER_CAL (diff) | |
download | kernel-qcow2-util-linux-f3932a6bb5c84fa27041fa8331b44e85a0827b91.tar.gz kernel-qcow2-util-linux-f3932a6bb5c84fa27041fa8331b44e85a0827b91.tar.xz kernel-qcow2-util-linux-f3932a6bb5c84fa27041fa8331b44e85a0827b91.zip |
tests: rewrite cal(1) bigyear test
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/cal')
-rwxr-xr-x | tests/ts/cal/bigyear | 121 | ||||
-rwxr-xr-x | tests/ts/cal/bigyearw | 98 |
2 files changed, 53 insertions, 166 deletions
diff --git a/tests/ts/cal/bigyear b/tests/ts/cal/bigyear index 5dced2a0f..d205c3afd 100755 --- a/tests/ts/cal/bigyear +++ b/tests/ts/cal/bigyear @@ -26,73 +26,58 @@ USETERM=$( ts_has_option "useterm" "$*" ) MYMONTH="12 2147483646" MYYEAR="2147483646" -[ "$USETERM" == "yes" ] && TS_VERBOSE="yes" -ts_log "" - - -ts_log "Gregorian - Monday-based month" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -1m -fi -$TS_CMD_CAL -1m $MYMONTH >> $TS_OUTPUT -ts_log "Gregorian - Sunday-based month" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -1s $MYMONTH -fi -$TS_CMD_CAL -1s $MYMONTH >> $TS_OUTPUT -ts_log "Julian - Monday-based month" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -1mj $MYMONTH -fi -$TS_CMD_CAL -1mj $MYMONTH >> $TS_OUTPUT -ts_log "Julian - Sunday-based month" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -1sj $MYMONTH -fi -$TS_CMD_CAL -1sj $MYMONTH >> $TS_OUTPUT - - -ts_log "Gregorian - Monday-based three months" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -3m -fi -$TS_CMD_CAL -3m $MYMONTH >> $TS_OUTPUT -ts_log "Gregorian - Sunday-based three months" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -3s $MYMONTH -fi -$TS_CMD_CAL -3s $MYMONTH >> $TS_OUTPUT -ts_log "Julian - Monday-based three months" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -3mj $MYMONTH -fi -$TS_CMD_CAL -3mj $MYMONTH >> $TS_OUTPUT -ts_log "Julian - Sunday-based three months" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -3sj $MYMONTH -fi -$TS_CMD_CAL -3sj $MYMONTH >> $TS_OUTPUT - - -ts_log "Gregorian - Monday-based year" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -1m $MYYEAR -fi -$TS_CMD_CAL -1m $MYYEAR >> $TS_OUTPUT -ts_log "Gregorian - Sunday-based year" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -1s $MYYEAR -fi -$TS_CMD_CAL -1s $MYYEAR >> $TS_OUTPUT -ts_log "Julian - Monday-based year" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -1mj $MYYEAR -fi -$TS_CMD_CAL -1mj $MYYEAR >> $TS_OUTPUT -ts_log "Julian - Sunday-based year" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -1sj $MYYEAR -fi -$TS_CMD_CAL -1sj $MYYEAR >> $TS_OUTPUT + +CAL_TEST_TIME=1516562739 # 21st January 2018 +export CAL_TEST_TIME + +function call_cal { + local testname=$(echo "$2" | sed 's/-//g') + + if [ "$3" == "$MYYEAR" ]; then + testname="${testname}-year" + else + testname="${testname}-month" + fi + + ts_init_subtest "$testname" + ts_log "$1" + shift + if [ "$USETERM" == "yes" ]; then + $TS_HELPER_CAL "$@" + fi + $TS_HELPER_CAL "$@" >> $TS_OUTPUT + ts_finalize_subtest +} + +call_cal "Gregorian - Monday-based month" -1m $MYMONTH +call_cal "Gregorian - Sunday-based month" -1s $MYMONTH +call_cal "Julian - Monday-based month" -1mj $MYMONTH +call_cal "Julian - Sunday-based month" -1sj $MYMONTH + +call_cal "Gregorian - Monday-based 3 months" -3m $MYMONTH +call_cal "Gregorian - Sunday-based 3 months" -3s $MYMONTH +call_cal "Julian - Monday-based 3 months" -3mj $MYMONTH +call_cal "Julian - Sunday-based 3 months" -3sj $MYMONTH + +call_cal "Gregorian - Monday-based year" -1m $MYYEAR +call_cal "Gregorian - Sunday-based year" -1s $MYYEAR +call_cal "Julian - Monday-based year" -1mj $MYYEAR +call_cal "Julian - Sunday-based year" -1sj $MYYEAR + + +call_cal "Gregorian - Monday-based month with weeks" -1mw $MYMONTH +call_cal "Gregorian - Sunday-based month with weeks" -1sw $MYMONTH +call_cal "Julian - Monday-based month with weeks" -1mjw $MYMONTH +call_cal "Julian - Sunday-based month with weeks" -1sjw $MYMONTH + +call_cal "Gregorian - Monday-based 3 months with weeks" -3mw $MYMONTH +call_cal "Gregorian - Sunday-based 3 months with weeks" -3sw $MYMONTH +call_cal "Julian - Monday-based 3 months with weeks" -3mjw $MYMONTH +call_cal "Julian - Sunday-based 3 months with weeks" -3sjw $MYMONTH + +call_cal "Gregorian - Monday-based year with weeks" -1mw $MYYEAR +call_cal "Gregorian - Sunday-based year with weeks" -1sw $MYYEAR +call_cal "Julian - Monday-based year with weeks" -1mjw $MYYEAR +call_cal "Julian - Sunday-based year with weeks" -1sjw $MYYEAR ts_finalize diff --git a/tests/ts/cal/bigyearw b/tests/ts/cal/bigyearw deleted file mode 100755 index 2ce9fc73d..000000000 --- a/tests/ts/cal/bigyearw +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash - -# This file is part of util-linux. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This file is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -TS_TOPDIR="${0%/*}/../.." -TS_DESC="Year 2147483646 with week numbers" - -. $TS_TOPDIR/functions.sh -ts_init "$*" - -ts_check_test_command "$TS_CMD_CAL" - -export TERM=linux - -USETERM=$( ts_has_option "useterm" "$*" ) -MYMONTH="12 2147483646" -MYYEAR="2147483646" - -[ "$USETERM" == "yes" ] && TS_VERBOSE="yes" -ts_log "" - - -ts_log "Gregorian - Monday-based month with week numbers" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -1mw -fi -$TS_CMD_CAL -1mw $MYMONTH >> $TS_OUTPUT -ts_log "Gregorian - Sunday-based month with week numbers" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -1sw $MYMONTH -fi -$TS_CMD_CAL -1sw $MYMONTH >> $TS_OUTPUT -ts_log "Julian - Monday-based month with week numbers" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -1mjw $MYMONTH -fi -$TS_CMD_CAL -1mjw $MYMONTH >> $TS_OUTPUT -ts_log "Julian - Sunday-based month with week numbers" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -1sjw $MYMONTH -fi -$TS_CMD_CAL -1sjw $MYMONTH >> $TS_OUTPUT - - -ts_log "Gregorian - Monday-based three months with week numbers" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -3mw -fi -$TS_CMD_CAL -3mw $MYMONTH >> $TS_OUTPUT -ts_log "Gregorian - Sunday-based three months with week numbers" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -3sw $MYMONTH -fi -$TS_CMD_CAL -3sw $MYMONTH >> $TS_OUTPUT -ts_log "Julian - Monday-based three months with week numbers" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -3mjw $MYMONTH -fi -$TS_CMD_CAL -3mjw $MYMONTH >> $TS_OUTPUT -ts_log "Julian - Sunday-based three months with week numbers" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -3sjw $MYMONTH -fi -$TS_CMD_CAL -3sjw $MYMONTH >> $TS_OUTPUT - - -ts_log "Gregorian - Monday-based year with week numbers" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -1mw $MYYEAR -fi -$TS_CMD_CAL -1mw $MYYEAR >> $TS_OUTPUT -ts_log "Gregorian - Sunday-based year with week numbers" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -1sw $MYYEAR -fi -$TS_CMD_CAL -1sw $MYYEAR >> $TS_OUTPUT -ts_log "Julian - Monday-based year with week numbers" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -1mjw $MYYEAR -fi -$TS_CMD_CAL -1mjw $MYYEAR >> $TS_OUTPUT -ts_log "Julian - Sunday-based year with week numbers" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -1sjw $MYYEAR -fi -$TS_CMD_CAL -1sjw $MYYEAR >> $TS_OUTPUT - -ts_finalize |