t/helper: merge test-prio-queue into test-tool

pclouds · gitster · commit 15b75817765b · 2018-03-27T08:45:47.000-07:00
Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/Makefile b/Makefile
@@ -670,14 +670,14 @@ TEST_BUILTINS_OBJS += test-mergesort.o
 TEST_BUILTINS_OBJS += test-mktemp.o
 TEST_BUILTINS_OBJS += test-online-cpus.o
 TEST_BUILTINS_OBJS += test-path-utils.o
+TEST_BUILTINS_OBJS += test-prio-queue.o
 TEST_BUILTINS_OBJS += test-sha1.o
 
 TEST_PROGRAMS_NEED_X += test-dump-fsmonitor
 TEST_PROGRAMS_NEED_X += test-dump-untracked-cache
 TEST_PROGRAMS_NEED_X += test-fake-ssh
 TEST_PROGRAMS_NEED_X += test-line-buffer
 TEST_PROGRAMS_NEED_X += test-parse-options
-TEST_PROGRAMS_NEED_X += test-prio-queue
 TEST_PROGRAMS_NEED_X += test-read-cache
 TEST_PROGRAMS_NEED_X += test-write-cache
 TEST_PROGRAMS_NEED_X += test-ref-store
diff --git a/t/helper/test-prio-queue.c b/t/helper/test-prio-queue.c
@@ -1,3 +1,4 @@
+#include "test-tool.h"
 #include "cache.h"
 #include "prio-queue.h"
 
@@ -16,7 +17,7 @@ static void show(int *v)
 	free(v);
 }
 
-int cmd_main(int argc, const char **argv)
+int cmd__prio_queue(int argc, const char **argv)
 {
 	struct prio_queue pq = { intcmp };
 
diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
@@ -25,6 +25,7 @@ static struct test_cmd cmds[] = {
 	{ "mktemp", cmd__mktemp },
 	{ "online-cpus", cmd__online_cpus },
 	{ "path-utils", cmd__path_utils },
+	{ "prio-queue", cmd__prio_queue },
 	{ "sha1", cmd__sha1 },
 };
 
diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
@@ -19,6 +19,7 @@ int cmd__mergesort(int argc, const char **argv);
 int cmd__mktemp(int argc, const char **argv);
 int cmd__online_cpus(int argc, const char **argv);
 int cmd__path_utils(int argc, const char **argv);
+int cmd__prio_queue(int argc, const char **argv);
 int cmd__sha1(int argc, const char **argv);
 
 #endif
diff --git a/t/t0009-prio-queue.sh b/t/t0009-prio-queue.sh
@@ -17,7 +17,7 @@ cat >expect <<'EOF'
 10
 EOF
 test_expect_success 'basic ordering' '
-	test-prio-queue 2 6 3 10 9 5 7 4 5 8 1 dump >actual &&
+	test-tool prio-queue 2 6 3 10 9 5 7 4 5 8 1 dump >actual &&
 	test_cmp expect actual
 '
 
@@ -30,7 +30,7 @@ cat >expect <<'EOF'
 6
 EOF
 test_expect_success 'mixed put and get' '
-	test-prio-queue 6 2 4 get 5 3 get get 1 dump >actual &&
+	test-tool prio-queue 6 2 4 get 5 3 get get 1 dump >actual &&
 	test_cmp expect actual
 '
 
@@ -43,7 +43,7 @@ NULL
 NULL
 EOF
 test_expect_success 'notice empty queue' '
-	test-prio-queue 1 2 get get get 1 2 get get get >actual &&
+	test-tool prio-queue 1 2 get get get 1 2 get get get >actual &&
 	test_cmp expect actual
 '
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#include "test-tool.h"`
`1`	`2`	`#include "cache.h"`
`2`	`3`	`#include "prio-queue.h"`
`3`	`4`
`@@ -16,7 +17,7 @@ static void show(int *v)`
`16`	`17`	`free(v);`
`17`	`18`	`}`
`18`	`19`
`19`		`-int cmd_main(int argc, const char **argv)`
	`20`	`+int cmd__prio_queue(int argc, const char **argv)`
`20`	`21`	`{`
`21`	`22`	`struct prio_queue pq = { intcmp };`
`22`	`23`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ cat >expect <<'EOF'`
`17`	`17`	`10`
`18`	`18`	`EOF`
`19`	`19`	`test_expect_success 'basic ordering' '`
`20`		`- test-prio-queue 2 6 3 10 9 5 7 4 5 8 1 dump >actual &&`
	`20`	`+ test-tool prio-queue 2 6 3 10 9 5 7 4 5 8 1 dump >actual &&`
`21`	`21`	`test_cmp expect actual`
`22`	`22`	`'`
`23`	`23`
`@@ -30,7 +30,7 @@ cat >expect <<'EOF'`
`30`	`30`	`6`
`31`	`31`	`EOF`
`32`	`32`	`test_expect_success 'mixed put and get' '`
`33`		`- test-prio-queue 6 2 4 get 5 3 get get 1 dump >actual &&`
	`33`	`+ test-tool prio-queue 6 2 4 get 5 3 get get 1 dump >actual &&`
`34`	`34`	`test_cmp expect actual`
`35`	`35`	`'`
`36`	`36`
`@@ -43,7 +43,7 @@ NULL`
`43`	`43`	`NULL`
`44`	`44`	`EOF`
`45`	`45`	`test_expect_success 'notice empty queue' '`
`46`		`- test-prio-queue 1 2 get get get 1 2 get get get >actual &&`
	`46`	`+ test-tool prio-queue 1 2 get get get 1 2 get get get >actual &&`
`47`	`47`	`test_cmp expect actual`
`48`	`48`	`'`
`49`	`49`