diff options
| author | Karel Zak | 2018-01-22 16:54:06 +0100 |
|---|---|---|
| committer | Karel Zak | 2018-01-22 16:54:06 +0100 |
| commit | 1b1f6f2511d1ad55fcca42255c35f12f6e6748fa (patch) | |
| tree | b9b8d461feb0e445750054ce223cd867a3e35d1c | |
| parent | tests: merge year cal(1) tests (diff) | |
| download | kernel-qcow2-util-linux-1b1f6f2511d1ad55fcca42255c35f12f6e6748fa.tar.gz kernel-qcow2-util-linux-1b1f6f2511d1ad55fcca42255c35f12f6e6748fa.tar.xz kernel-qcow2-util-linux-1b1f6f2511d1ad55fcca42255c35f12f6e6748fa.zip | |
test: use subtests for jan1753 cal(1) test
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | tests/expected/cal/jan1753 | 19 | ||||
| -rw-r--r-- | tests/expected/cal/jan1753-3w | 9 | ||||
| -rw-r--r-- | tests/expected/cal/jan1753-m3w | 9 | ||||
| -rwxr-xr-x | tests/ts/cal/jan1753 | 30 |
4 files changed, 34 insertions, 33 deletions
diff --git a/tests/expected/cal/jan1753 b/tests/expected/cal/jan1753 deleted file mode 100644 index 6ae106b43..000000000 --- a/tests/expected/cal/jan1753 +++ /dev/null @@ -1,19 +0,0 @@ - -Monday-based 1753 week numbers - December 1752 January 1753 February 1753 - Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su -47 1 2 3 1 1 2 3 4 5 6 7 5 1 2 3 4 -48 4 5 6 7 8 9 10 2 8 9 10 11 12 13 14 6 5 6 7 8 9 10 11 -49 11 12 13 14 15 16 17 3 15 16 17 18 19 20 21 7 12 13 14 15 16 17 18 -50 18 19 20 21 22 23 24 4 22 23 24 25 26 27 28 8 19 20 21 22 23 24 25 -51 25 26 27 28 29 30 31 5 29 30 31 9 26 27 28 - -Sunday-based 1753 week numbers - December 1752 January 1753 February 1753 - Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa -47 1 2 1 1 2 3 4 5 6 5 1 2 3 -48 3 4 5 6 7 8 9 2 7 8 9 10 11 12 13 6 4 5 6 7 8 9 10 -49 10 11 12 13 14 15 16 3 14 15 16 17 18 19 20 7 11 12 13 14 15 16 17 -50 17 18 19 20 21 22 23 4 21 22 23 24 25 26 27 8 18 19 20 21 22 23 24 -51 24 25 26 27 28 29 30 5 28 29 30 31 9 25 26 27 28 -52 31 diff --git a/tests/expected/cal/jan1753-3w b/tests/expected/cal/jan1753-3w new file mode 100644 index 000000000..0db08a9ad --- /dev/null +++ b/tests/expected/cal/jan1753-3w @@ -0,0 +1,9 @@ +Sunday-based 1753 week numbers + December 1752 January 1753 February 1753 + Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa +47 1 2 1 1 2 3 4 5 6 5 1 2 3 +48 3 4 5 6 7 8 9 2 7 8 9 10 11 12 13 6 4 5 6 7 8 9 10 +49 10 11 12 13 14 15 16 3 14 15 16 17 18 19 20 7 11 12 13 14 15 16 17 +50 17 18 19 20 21 22 23 4 21 22 23 24 25 26 27 8 18 19 20 21 22 23 24 +51 24 25 26 27 28 29 30 5 28 29 30 31 9 25 26 27 28 +52 31 diff --git a/tests/expected/cal/jan1753-m3w b/tests/expected/cal/jan1753-m3w new file mode 100644 index 000000000..98a9bd9bf --- /dev/null +++ b/tests/expected/cal/jan1753-m3w @@ -0,0 +1,9 @@ +Monday-based 1753 week numbers + December 1752 January 1753 February 1753 + Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su +47 1 2 3 1 1 2 3 4 5 6 7 5 1 2 3 4 +48 4 5 6 7 8 9 10 2 8 9 10 11 12 13 14 6 5 6 7 8 9 10 11 +49 11 12 13 14 15 16 17 3 15 16 17 18 19 20 21 7 12 13 14 15 16 17 18 +50 18 19 20 21 22 23 24 4 22 23 24 25 26 27 28 8 19 20 21 22 23 24 25 +51 25 26 27 28 29 30 31 5 29 30 31 9 26 27 28 + diff --git a/tests/ts/cal/jan1753 b/tests/ts/cal/jan1753 index 85dbf3530..1be3db3b8 100755 --- a/tests/ts/cal/jan1753 +++ b/tests/ts/cal/jan1753 @@ -25,19 +25,21 @@ export TERM=linux USETERM=$( ts_has_option "useterm" "$*" ) MYMONTH="1 1753" -[ "$USETERM" == "yes" ] && TS_VERBOSE="yes" -ts_log "" - -ts_log "Monday-based 1753 week numbers" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -m3w $MYMONTH -fi -$TS_CMD_CAL -m3w $MYMONTH >> $TS_OUTPUT - -ts_log "Sunday-based 1753 week numbers" -if [ "$USETERM" == "yes" ]; then - $TS_CMD_CAL -3w $MYMONTH -fi -$TS_CMD_CAL -3w $MYMONTH >> $TS_OUTPUT +function call_cal { + local testname=$(echo "$2" | sed 's/-//g') + + ts_init_subtest "$testname" + ts_log "$1" + shift + if [ "$USETERM" == "yes" ]; then + $TS_CMD_CAL "$@" + fi + $TS_CMD_CAL "$@" >> $TS_OUTPUT + + ts_finalize_subtest +} + +call_cal "Monday-based 1753 week numbers" -m3w $MYMONTH +call_cal "Sunday-based 1753 week numbers" -3w $MYMONTH ts_finalize |