tests: remove dependence on helpers/libpreload-time.so

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/commands.sh.in b/tests/commands.sh.in
index c659d1a30fb615d7d7e89c99bbaf1733a9faecf2..f8128bb898e451976b6fb074c574a3b40cef990c 100644 (file)
--- a/tests/commands.sh.in
+++ b/tests/commands.sh.in
@@ -6,7 +6,6 @@ TS_TESTUSER=${TS_TESTUSER:-"test"}
 
 # helpers
 TS_HELPER_SYSINFO="$TS_TOPDIR/helpers/mnt_test_sysinfo"
-TS_HELPER_LIBPRELOAD_TIME="$TS_TOPDIR/helpers/.libs/libpreload-time.so"
 
 # external commands
 TS_ECMD_BLKID="@BLKID@"
@@ -31,6 +30,7 @@ TS_CMD_COL=${TS_CMD_COL:-"$TOPDIR/text-utils/col"}
 TS_CMD_NAMEI=${TS_CMD_NAMEI-"$TOPDIR/misc-utils/namei"}
 TS_CMD_LOOK=${TS_CMD_LOOK-"$TOPDIR/misc-utils/look"}
 TS_CMD_CAL=${TS_CMD_CAL-"$TOPDIR/misc-utils/cal"}
+TS_CMD_CALTEST=${TS_CMD_CALTEST-"$TOPDIR/misc-utils/cal_test"}
 
 TS_CMD_CHECKTTY=${TS_CMD_CHECKTTY-"$TOPDIR/login-utils/checktty_test"}
 

diff --git a/tests/ts-cal-1 b/tests/ts-cal-1
index 674e4dd88d06dec71ad76a208ff938017bb83c29..092420107cd425f9bbd3d1556b436628b7582d30 100755 (executable)
--- a/tests/ts-cal-1
+++ b/tests/ts-cal-1
@@ -33,28 +33,28 @@ ts_log ""
 
 ts_log "Gregorian - Monday-based week"
 if [ "$USETERM" == "yes" ]; then
-       TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -1m
+       TEST_TIME=$MYTIME $TS_CMD_CALTEST -1m
 fi
-TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -1m >> $TS_OUTPUT
+TEST_TIME=$MYTIME $TS_CMD_CALTEST -1m >> $TS_OUTPUT
 
 ts_log "Gregorian - Sunday-based week"
 if [ "$USETERM" == "yes" ]; then
-       TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -1s
+       TEST_TIME=$MYTIME $TS_CMD_CALTEST -1s
 fi
-TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -1s >> $TS_OUTPUT
+TEST_TIME=$MYTIME $TS_CMD_CALTEST -1s >> $TS_OUTPUT
 
 
 ts_log "Julian - Monday-based week"
 if [ "$USETERM" == "yes" ]; then
-       TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -1mj
+       TEST_TIME=$MYTIME $TS_CMD_CALTEST -1mj
 fi
-TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -1mj >> $TS_OUTPUT
+TEST_TIME=$MYTIME $TS_CMD_CALTEST -1mj >> $TS_OUTPUT
 
 ts_log "Julian - Sunday-based week"
 if [ "$USETERM" == "yes" ]; then
-       TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -1sj
+       TEST_TIME=$MYTIME $TS_CMD_CALTEST -1sj
 fi
-TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -1sj >> $TS_OUTPUT
+TEST_TIME=$MYTIME $TS_CMD_CALTEST -1sj >> $TS_OUTPUT
 
 ts_finalize
 

diff --git a/tests/ts-cal-3 b/tests/ts-cal-3
index eeb6e0e1292c6cbc3aa1f9ccc7a50aeffbe3a527..e8da56f8277c247b0dce44109a85a0c9129da066 100755 (executable)
--- a/tests/ts-cal-3
+++ b/tests/ts-cal-3
@@ -33,28 +33,28 @@ ts_log ""
 
 ts_log "Gregorian - Monday-based week"
 if [ "$USETERM" == "yes" ]; then
-       TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -3m
+       TEST_TIME=$MYTIME  $TS_CMD_CALTEST -3m
 fi
-TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -3m >> $TS_OUTPUT
+TEST_TIME=$MYTIME $TS_CMD_CALTEST -3m >> $TS_OUTPUT
 
 ts_log "Gregorian - Sunday-based week"
 if [ "$USETERM" == "yes" ]; then
-       TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -3s
+       TEST_TIME=$MYTIME  $TS_CMD_CALTEST -3s
 fi
-TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -3s >> $TS_OUTPUT
+TEST_TIME=$MYTIME $TS_CMD_CALTEST -3s >> $TS_OUTPUT
 
 
 ts_log "Julian - Monday-based week"
 if [ "$USETERM" == "yes" ]; then
-       TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -3mj
+       TEST_TIME=$MYTIME $TS_CMD_CALTEST -3mj
 fi
-TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -3mj >> $TS_OUTPUT
+TEST_TIME=$MYTIME $TS_CMD_CALTEST -3mj >> $TS_OUTPUT
 
 ts_log "Julian - Sunday-based week"
 if [ "$USETERM" == "yes" ]; then
-       TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -3sj
+       TEST_TIME=$MYTIME  $TS_CMD_CALTEST -3sj
 fi
-TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -3sj >> $TS_OUTPUT
+TEST_TIME=$MYTIME $TS_CMD_CALTEST -3sj >> $TS_OUTPUT
 
 ts_finalize
 

diff --git a/tests/ts-cal-y b/tests/ts-cal-y
index 253bec235c7b69295f68471872f0f44b0797770d..f9c60bd12971bf05b6f9183f2925416a16ff2a25 100755 (executable)
--- a/tests/ts-cal-y
+++ b/tests/ts-cal-y
@@ -33,28 +33,28 @@ ts_log ""
 
 ts_log "Gregorian - Monday-based week"
 if [ "$USETERM" == "yes" ]; then
-       TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -ym
+       TEST_TIME=$MYTIME $TS_CMD_CALTEST -ym
 fi
-TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -ym >> $TS_OUTPUT
+TEST_TIME=$MYTIME $TS_CMD_CALTEST -ym >> $TS_OUTPUT
 
 ts_log "Gregorian - Sunday-based week"
 if [ "$USETERM" == "yes" ]; then
-       TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -ys
+       TEST_TIME=$MYTIME $TS_CMD_CALTEST -ys
 fi
-TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -ys >> $TS_OUTPUT
+TEST_TIME=$MYTIME $TS_CMD_CALTEST -ys >> $TS_OUTPUT
 
 
 ts_log "Julian - Monday-based week"
 if [ "$USETERM" == "yes" ]; then
-       TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -ymj
+       TEST_TIME=$MYTIME $TS_CMD_CALTEST -ymj
 fi
-TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -ymj >> $TS_OUTPUT
+TEST_TIME=$MYTIME $TS_CMD_CALTEST -ymj >> $TS_OUTPUT
 
 ts_log "Julian - Sunday-based week"
 if [ "$USETERM" == "yes" ]; then
-       TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -ysj
+       TEST_TIME=$MYTIME $TS_CMD_CALTEST -ysj
 fi
-TEST_TIME=$MYTIME LD_PRELOAD=$TS_HELPER_LIBPRELOAD_TIME $TS_CMD_CAL -ysj >> $TS_OUTPUT
+TEST_TIME=$MYTIME $TS_CMD_CALTEST -ysj >> $TS_OUTPUT
 
 ts_finalize