ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: use TS_HELPER_CAL 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2018-02-02 10:16:27 +01:00
parent b9d9ab7dae
commit 22db7b5132
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/commands.sh
View File

@ -39,6 +39,7 @@ TS_HELPER_TIOCSTI="$top_builddir/test_tiocsti"
TS_HELPER_UUID_PARSER="$top_builddir/test_uuid_parser" TS_HELPER_UUID_PARSER="$top_builddir/test_uuid_parser"
TS_HELPER_UUID_NAMESPACE="$top_builddir/test_uuid_namespace" TS_HELPER_UUID_NAMESPACE="$top_builddir/test_uuid_namespace"
TS_HELPER_MBSENCODE="$top_builddir/test_mbsencode" TS_HELPER_MBSENCODE="$top_builddir/test_mbsencode"
TS_HELPER_CAL="$top_builddir/test_cal"
# paths to commands # paths to commands
TS_CMD_ADDPART=${TS_CMD_ADDPART:-"$top_builddir/addpart"} TS_CMD_ADDPART=${TS_CMD_ADDPART:-"$top_builddir/addpart"}

7
tests/ts/cal/month
View File

@ -29,6 +29,9 @@ export TERM=linux
USETERM=$( ts_has_option "useterm" "$*" ) USETERM=$( ts_has_option "useterm" "$*" )
MYTIME="27 09 2006" MYTIME="27 09 2006"
CAL_TEST_TIME=1516562739 # 21st January 2018
export CAL_TEST_TIME
function call_cal { function call_cal {
local testname=$(echo "$2" | sed 's/-//g') local testname=$(echo "$2" | sed 's/-//g')
@ -36,9 +39,9 @@ function call_cal {
ts_log "$1" ts_log "$1"
shift shift
if [ "$USETERM" == "yes" ]; then if [ "$USETERM" == "yes" ]; then
$TS_CMD_CAL "$@" $TS_HELPER_CAL "$@"
fi fi
$TS_CMD_CAL "$@" >> $TS_OUTPUT $TS_HELPER_CAL "$@" >> $TS_OUTPUT
ts_finalize_subtest ts_finalize_subtest
} }

7
tests/ts/cal/sep1752
View File

@ -26,13 +26,16 @@ USETERM=$( ts_has_option "useterm" "$*" )
MYMONTH="09 1752" MYMONTH="09 1752"
MYYEAR="1752" MYYEAR="1752"
CAL_TEST_TIME=1516562739 # 21st January 2018
export CAL_TEST_TIME
function call_cal_simple { function call_cal_simple {
ts_log "$1" ts_log "$1"
shift shift
if [ "$USETERM" == "yes" ]; then if [ "$USETERM" == "yes" ]; then
$TS_CMD_CAL "$@" $TS_HELPER_CAL "$@"
fi fi
$TS_CMD_CAL "$@" >> $TS_OUTPUT $TS_HELPER_CAL "$@" >> $TS_OUTPUT
} }
function call_cal { function call_cal {