From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 13 Jan 2021 12:19:40 +0000 (+0000)
Subject: tests: Add macro for shorter listing of tests
X-Git-Tag: 0.9.28~1285^2~880
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0aba66517fc15b2c4cc6d8dc317938779e4f6c4;p=pakfire.git

tests: Add macro for shorter listing of tests

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/tests/libpakfire/arch.c b/tests/libpakfire/arch.c
index d6005c810..9e0697dd0 100644
--- a/tests/libpakfire/arch.c
+++ b/tests/libpakfire/arch.c
@@ -97,10 +97,10 @@ int test_machine(const test_t* t) {
 int main(int argc, char** argv) {
 	testsuite_t* ts = testsuite_create(4);
 
-	testsuite_add_test(ts, "test_native", test_native);
-	testsuite_add_test(ts, "test_supported", test_supported);
-	testsuite_add_test(ts, "test_compatible", test_compatible);
-	testsuite_add_test(ts, "test_machine", test_machine);
+	testsuite_add_test(ts, test_native);
+	testsuite_add_test(ts, test_supported);
+	testsuite_add_test(ts, test_compatible);
+	testsuite_add_test(ts, test_machine);
 
 	return testsuite_run(ts);
 }
diff --git a/tests/libpakfire/archive.c b/tests/libpakfire/archive.c
index 5a10c3e48..781c4c8c4 100644
--- a/tests/libpakfire/archive.c
+++ b/tests/libpakfire/archive.c
@@ -89,9 +89,9 @@ int test_import(const test_t* t) {
 int main(int argc, char** argv) {
 	testsuite_t* ts = testsuite_create(3);
 
-	testsuite_add_test(ts, "test_open", test_open);
-	testsuite_add_test(ts, "test_extract", test_extract);
-	testsuite_add_test(ts, "test_import", test_import);
+	testsuite_add_test(ts, test_open);
+	testsuite_add_test(ts, test_extract);
+	testsuite_add_test(ts, test_import);
 
 	return testsuite_run(ts);
 }
diff --git a/tests/libpakfire/execute.c b/tests/libpakfire/execute.c
index 0d244f725..2e14852f1 100644
--- a/tests/libpakfire/execute.c
+++ b/tests/libpakfire/execute.c
@@ -37,7 +37,7 @@ int test_does_not_exist(const test_t* t) {
 int main(int argc, char** argv) {
 	testsuite_t* ts = testsuite_create(1);
 
-	testsuite_add_test(ts, "test_does_not_exist", test_does_not_exist);
+	testsuite_add_test(ts, test_does_not_exist);
 
 	return testsuite_run(ts);
 }
diff --git a/tests/libpakfire/key.c b/tests/libpakfire/key.c
index 482f3b857..0c95f9f51 100644
--- a/tests/libpakfire/key.c
+++ b/tests/libpakfire/key.c
@@ -98,9 +98,9 @@ int test_export(const test_t* t) {
 int main(int argc, char** argv) {
 	testsuite_t* ts = testsuite_create(3);
 
-	testsuite_add_test(ts, "test_init", test_init);
-	testsuite_add_test(ts, "test_import", test_import);
-	testsuite_add_test(ts, "test_export", test_export);
+	testsuite_add_test(ts, test_init);
+	testsuite_add_test(ts, test_import);
+	testsuite_add_test(ts, test_export);
 
 	return testsuite_run(ts);
 }
diff --git a/tests/libpakfire/main.c b/tests/libpakfire/main.c
index de5e0bc85..4eac50753 100644
--- a/tests/libpakfire/main.c
+++ b/tests/libpakfire/main.c
@@ -40,8 +40,8 @@ static int test_path(const test_t* t) {
 int main(int argc, char** argv) {
 	testsuite_t* ts = testsuite_create(2);
 
-	testsuite_add_test(ts, "test_init", test_init);
-	testsuite_add_test(ts, "test_path", test_path);
+	testsuite_add_test(ts, test_init);
+	testsuite_add_test(ts, test_path);
 
 	return testsuite_run(ts);
 }
diff --git a/tests/libpakfire/makefile.c b/tests/libpakfire/makefile.c
index a32cc0710..290a18c0c 100644
--- a/tests/libpakfire/makefile.c
+++ b/tests/libpakfire/makefile.c
@@ -55,7 +55,7 @@ int test_parse(const test_t* t) {
 int main(int argc, char** argv) {
 	testsuite_t* ts = testsuite_create(1);
 
-	testsuite_add_test(ts, "test_parse", test_parse);
+	testsuite_add_test(ts, test_parse);
 
 	return testsuite_run(ts);
 }
diff --git a/tests/libpakfire/parser.c b/tests/libpakfire/parser.c
index 56f084f22..f40fe9cc5 100644
--- a/tests/libpakfire/parser.c
+++ b/tests/libpakfire/parser.c
@@ -105,7 +105,7 @@ int test_parser(const test_t* t) {
 int main(int argc, char** argv) {
 	testsuite_t* ts = testsuite_create(1);
 
-	testsuite_add_test(ts, "test_parser", test_parser);
+	testsuite_add_test(ts, test_parser);
 
 	return testsuite_run(ts);
 }
diff --git a/tests/libpakfire/util.c b/tests/libpakfire/util.c
index e196388c2..22e488828 100644
--- a/tests/libpakfire/util.c
+++ b/tests/libpakfire/util.c
@@ -60,9 +60,9 @@ static int test_string_startswith(const test_t* t) {
 int main(int argc, char** argv) {
 	testsuite_t* ts = testsuite_create(3);
 
-	testsuite_add_test(ts, "test_basename", test_basename);
-	testsuite_add_test(ts, "test_dirname", test_dirname);
-	testsuite_add_test(ts, "test_string_startswith", test_string_startswith);
+	testsuite_add_test(ts, test_basename);
+	testsuite_add_test(ts, test_dirname);
+	testsuite_add_test(ts, test_string_startswith);
 
 	return testsuite_run(ts);
 }
diff --git a/tests/testsuite.c b/tests/testsuite.c
index f2f095fc0..1f309faa5 100644
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -65,7 +65,7 @@ testsuite_t* testsuite_create(size_t n) {
 	return ts;
 };
 
-int testsuite_add_test(testsuite_t* ts, const char* name, test_function_t func) {
+int __testsuite_add_test(testsuite_t* ts, const char* name, test_function_t func) {
 	if (ts->left == 0)
 		exit(EXIT_FAILURE);
 
diff --git a/tests/testsuite.h b/tests/testsuite.h
index 0d5b9eb23..d42474b76 100644
--- a/tests/testsuite.h
+++ b/tests/testsuite.h
@@ -46,7 +46,7 @@ typedef struct testsuite {
 } testsuite_t;
 
 testsuite_t* testsuite_create(size_t n);
-int testsuite_add_test(testsuite_t* ts, const char* name, test_function_t func);
+int __testsuite_add_test(testsuite_t* ts, const char* name, test_function_t func);
 int testsuite_run(testsuite_t* ts);
 
 #define _LOG(prefix, fmt, ...) fprintf(stderr, "TESTS: " prefix fmt, ## __VA_ARGS__);
@@ -54,6 +54,8 @@ int testsuite_run(testsuite_t* ts);
 #define LOG_WARN(fmt, ...) _LOG("WARN: ", fmt, ## __VA_ARGS__);
 #define LOG_ERROR(fmt, ...) _LOG("ERROR: ", fmt, ## __VA_ARGS__);
 
+#define testsuite_add_test(ts, func) __testsuite_add_test(ts, #func, func)
+
 #define assert_return(expr, r) \
 	do { \
 		if ((!(expr))) { \