t/helper: merge test-date into test-tool

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index d09710dc3dc48ae98bf7c001e2dd9d0510e7f75f..efb1872c525f177a635843cf41e4c14ffdf02caf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -655,10 +655,10 @@ PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS))
 TEST_BUILTINS_OBJS += test-chmtime.o
 TEST_BUILTINS_OBJS += test-config.o
 TEST_BUILTINS_OBJS += test-ctype.o
 TEST_BUILTINS_OBJS += test-chmtime.o
 TEST_BUILTINS_OBJS += test-config.o
 TEST_BUILTINS_OBJS += test-ctype.o

+TEST_BUILTINS_OBJS += test-date.o

 TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o
 TEST_BUILTINS_OBJS += test-sha1.o
 
 TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o
 TEST_BUILTINS_OBJS += test-sha1.o
 

-TEST_PROGRAMS_NEED_X += test-date

 TEST_PROGRAMS_NEED_X += test-delta
 TEST_PROGRAMS_NEED_X += test-drop-caches
 TEST_PROGRAMS_NEED_X += test-dump-cache-tree
 TEST_PROGRAMS_NEED_X += test-delta
 TEST_PROGRAMS_NEED_X += test-drop-caches
 TEST_PROGRAMS_NEED_X += test-dump-cache-tree

diff --git a/t/helper/test-date.c b/t/helper/test-date.c
index ac8368797073adfdf203f60d93df55a988443dbd..a0837371aba17956331ddcdb04847c6c9edeefd2 100644 (file)
--- a/t/helper/test-date.c
+++ b/t/helper/test-date.c
@@ -1,13 +1,14 @@
+#include "test-tool.h"

 #include "cache.h"
 
 static const char *usage_msg = "\n"
 #include "cache.h"
 
 static const char *usage_msg = "\n"

-"  test-date relative [time_t]...\n"
-"  test-date show:<format> [time_t]...\n"
-"  test-date parse [date]...\n"
-"  test-date approxidate [date]...\n"
-"  test-date timestamp [date]...\n"
-"  test-date is64bit\n"
-"  test-date time_t-is64bit\n";
+"  test-tool date relative [time_t]...\n"
+"  test-tool date show:<format> [time_t]...\n"
+"  test-tool date parse [date]...\n"
+"  test-tool date approxidate [date]...\n"
+"  test-tool date timestamp [date]...\n"
+"  test-tool date is64bit\n"
+"  test-tool date time_t-is64bit\n";

 
 static void show_relative_dates(const char **argv, struct timeval *now)
 {
 
 static void show_relative_dates(const char **argv, struct timeval *now)
 {


@@ -81,7 +82,7 @@ static void parse_approx_timestamp(const char **argv, struct timeval *now)
        }
 }
 
        }
 }
 

-int cmd_main(int argc, const char **argv)
+int cmd__date(int argc, const char **argv)

 {
        struct timeval now;
        const char *x;
 {
        struct timeval now;
        const char *x;

diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
index a1999495a6bf4a3fcc5a43c3655b2ec02f98b59d..cae060d492de29663becbc8c45136ad606e95b69 100644 (file)
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@ -10,6 +10,7 @@ static struct test_cmd cmds[] = {
        { "chmtime", cmd__chmtime },
        { "config", cmd__config },
        { "ctype", cmd__ctype },
        { "chmtime", cmd__chmtime },
        { "config", cmd__config },
        { "ctype", cmd__ctype },

+       { "date", cmd__date },

        { "lazy-init-name-hash", cmd__lazy_init_name_hash },
        { "sha1", cmd__sha1 },
 };
        { "lazy-init-name-hash", cmd__lazy_init_name_hash },
        { "sha1", cmd__sha1 },
 };

diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
index 41805ecd1c63a416be2fb4d0c74acae86edb9683..31c20bb6566d538d9025629b450c52e5b47bf3ad 100644 (file)
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -4,6 +4,7 @@
 int cmd__chmtime(int argc, const char **argv);
 int cmd__config(int argc, const char **argv);
 int cmd__ctype(int argc, const char **argv);
 int cmd__chmtime(int argc, const char **argv);
 int cmd__config(int argc, const char **argv);
 int cmd__ctype(int argc, const char **argv);

+int cmd__date(int argc, const char **argv);

 int cmd__lazy_init_name_hash(int argc, const char **argv);
 int cmd__sha1(int argc, const char **argv);
 
 int cmd__lazy_init_name_hash(int argc, const char **argv);
 int cmd__sha1(int argc, const char **argv);
 

diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index 7ac9466d5055e02179467fa9e41004bbc89df6dc..64ff86df8eb02aa635af1bad0b6d1f31578f222a 100755 (executable)
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -10,7 +10,7 @@ check_relative() {
        t=$(($TEST_DATE_NOW - $1))
        echo "$t -> $2" >expect
        test_expect_${3:-success} "relative date ($2)" "
        t=$(($TEST_DATE_NOW - $1))
        echo "$t -> $2" >expect
        test_expect_${3:-success} "relative date ($2)" "

-       test-date relative $t >actual &&
+       test-tool date relative $t >actual &&

        test_i18ncmp expect actual
        "
 }
        test_i18ncmp expect actual
        "
 }


@@ -35,7 +35,7 @@ check_show () {
        zone=$5
        test_expect_success $prereqs "show date ($format:$time)" '
                echo "$time -> $expect" >expect &&
        zone=$5
        test_expect_success $prereqs "show date ($format:$time)" '
                echo "$time -> $expect" >expect &&

-               TZ=${zone:-$TZ} test-date show:"$format" "$time" >actual &&
+               TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&

                test_cmp expect actual
        '
 }
                test_cmp expect actual
        '
 }


@@ -71,7 +71,7 @@ check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" TIME_IS_64BIT,TIME_T_
 check_parse() {
        echo "$1 -> $2" >expect
        test_expect_${4:-success} "parse date ($1${3:+ TZ=$3})" "
 check_parse() {
        echo "$1 -> $2" >expect
        test_expect_${4:-success} "parse date ($1${3:+ TZ=$3})" "

-       TZ=${3:-$TZ} test-date parse '$1' >actual &&
+       TZ=${3:-$TZ} test-tool date parse '$1' >actual &&

        test_cmp expect actual
        "
 }
        test_cmp expect actual
        "
 }


@@ -92,7 +92,7 @@ check_parse '2008-02-14 20:30:45' '2008-02-14 20:30:45 -0500' EST5
 check_approxidate() {
        echo "$1 -> $2 +0000" >expect
        test_expect_${3:-success} "parse approxidate ($1)" "
 check_approxidate() {
        echo "$1 -> $2 +0000" >expect
        test_expect_${3:-success} "parse approxidate ($1)" "

-       test-date approxidate '$1' >actual &&
+       test-tool date approxidate '$1' >actual &&

        test_cmp expect actual
        "
 }
        test_cmp expect actual
        "
 }

diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 4f8e6f5fde3295cc91d2feb1fd85fa007e56016c..8780934478b4806819259e432d39bc10b2c7cfd6 100755 (executable)
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -914,7 +914,7 @@ test_expect_success 'get --expiry-date' '
        invalid1 = "abc"
        EOF
        cat >expect <<-EOF &&
        invalid1 = "abc"
        EOF
        cat >expect <<-EOF &&

-       $(test-date timestamp $rel)
+       $(test-tool date timestamp $rel)

        1275666415
        1510441871
        1510348087
        1275666415
        1510441871
        1510348087

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 7ab8af47a56f8cd5b1083292c0f00522f66c04f6..483c8d6d7cd9734c04552043b5ff0cb7d1b0af3a 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1206,5 +1206,5 @@ test_lazy_prereq LONG_IS_64BIT '
        test 8 -le "$(build_option sizeof-long)"
 '
 
        test 8 -le "$(build_option sizeof-long)"
 '
 

-test_lazy_prereq TIME_IS_64BIT 'test-date is64bit'
-test_lazy_prereq TIME_T_IS_64BIT 'test-date time_t-is64bit'
+test_lazy_prereq TIME_IS_64BIT 'test-tool date is64bit'
+test_lazy_prereq TIME_T_IS_64BIT 'test-tool date time_t-is64bit'