From 8297b3faf8606762b176d57637f2ec5f84601e0d Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Date: Sat, 4 Dec 2021 21:12:06 +0100
Subject: Fix: unit test and sample program Windows build
Now that there is a wrapper for main() on Windows, all executable
programs must use a common, cannonical signature for main().
Furthermore, the Windows version of the epoch test needs wrappers
for setenv/unsetenv.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
tests/libutil/is_memory_zero.c | 3 ++-
tests/libutil/rbtree.c | 3 ++-
tests/libutil/str_table.c | 3 ++-
tests/libutil/threadpool.c | 3 ++-
tests/libutil/xxhash.c | 3 ++-
5 files changed, 10 insertions(+), 5 deletions(-)
(limited to 'tests/libutil')
diff --git a/tests/libutil/is_memory_zero.c b/tests/libutil/is_memory_zero.c
index 20bd93f..0d10dd8 100644
--- a/tests/libutil/is_memory_zero.c
+++ b/tests/libutil/is_memory_zero.c
@@ -9,10 +9,11 @@
#include "../test.h"
#include "util.h"
-int main(void)
+int main(int argc, char **argv)
{
unsigned char temp[1024];
size_t i, j;
+ (void)argc; (void)argv;
memset(temp, 0, sizeof(temp));
diff --git a/tests/libutil/rbtree.c b/tests/libutil/rbtree.c
index c430d67..05f7aa3 100644
--- a/tests/libutil/rbtree.c
+++ b/tests/libutil/rbtree.c
@@ -151,7 +151,7 @@ static int check_subtrees_equal(const rbtree_node_t *lhs,
return 0;
}
-int main(void)
+int main(int argc, char **argv)
{
size_t count, blkdepth, mind, maxd;
sqfs_s32 key, key2;
@@ -159,6 +159,7 @@ int main(void)
rbtree_node_t *n;
sqfs_u64 value;
int ret;
+ (void)argc; (void)argv;
TEST_ASSERT(rbtree_init(&rb, sizeof(sqfs_s32),
sizeof(sqfs_u64), key_compare) == 0);
diff --git a/tests/libutil/str_table.c b/tests/libutil/str_table.c
index 9baba27..b75bb91 100644
--- a/tests/libutil/str_table.c
+++ b/tests/libutil/str_table.c
@@ -34,11 +34,12 @@ static int read_strings(void)
return 0;
}
-int main(void)
+int main(int argc, char **argv)
{
str_table_t table;
size_t i, j, idx;
const char *str;
+ (void)argc; (void)argv;
TEST_ASSERT(chdir(TEST_PATH) == 0);
diff --git a/tests/libutil/threadpool.c b/tests/libutil/threadpool.c
index 566239f..cd52ad3 100644
--- a/tests/libutil/threadpool.c
+++ b/tests/libutil/threadpool.c
@@ -40,13 +40,14 @@ static int worker(void *user, void *work_item)
return 0;
}
-int main(void)
+int main(int argc, char **argv)
{
unsigned int values[10];
thread_pool_t *pool;
unsigned int *ptr;
size_t i, count;
int ret;
+ (void)argc; (void)argv;
pool = thread_pool_create(10, worker);
TEST_NOT_NULL(pool);
diff --git a/tests/libutil/xxhash.c b/tests/libutil/xxhash.c
index 6e17097..b0b1bac 100644
--- a/tests/libutil/xxhash.c
+++ b/tests/libutil/xxhash.c
@@ -44,10 +44,11 @@ static const struct {
},
};
-int main(void)
+int main(int argc, char **argv)
{
sqfs_u32 hash;
size_t i;
+ (void)argc; (void)argv;
for (i = 0; i < sizeof(test_vectors) / sizeof(test_vectors[0]); ++i) {
hash = xxh32(test_vectors[i].plaintext, test_vectors[i].psize);
--
cgit v1.2.3