diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/internals/test_common.c | 2 | ||||
-rw-r--r-- | tests/internals/test_common.h | 4 | ||||
-rw-r--r-- | tests/internals/test_internals.c | 12 | ||||
-rw-r--r-- | tests/internals/test_rate_limiter.c | 10 | ||||
-rw-r--r-- | tests/odirect_read.c | 2 | ||||
-rw-r--r-- | tests/odirect_write.c | 5 | ||||
-rw-r--r-- | tests/test_dir_rewind.c | 4 |
7 files changed, 18 insertions, 21 deletions
diff --git a/tests/internals/test_common.c b/tests/internals/test_common.c index 6c10292..449c64a 100644 --- a/tests/internals/test_common.c +++ b/tests/internals/test_common.c @@ -3,7 +3,7 @@ int failures = 0; -int run_suite(void (*suite)()) { +int run_suite(void (*suite)(void)) { suite(); return (failures > 0) ? 1 : 0; } diff --git a/tests/internals/test_common.h b/tests/internals/test_common.h index 1688add..055fc38 100644 --- a/tests/internals/test_common.h +++ b/tests/internals/test_common.h @@ -10,8 +10,8 @@ extern int failures; #define TEST_ASSERT(expr) do { if (!(expr)) { printf("Assertion failed: %s:%d: `%s'\n", __FILE__, __LINE__, #expr); ++failures; } } while (0); #define NEAR(a, b, eps) (fabs((a) - (b)) < (eps)) -int run_suite(void (*suite)()); +int run_suite(void (*suite)(void)); -#define TEST_MAIN(suite) int main() { return run_suite(suite); } +#define TEST_MAIN(suite) int main(void) { return run_suite(suite); } #endif diff --git a/tests/internals/test_internals.c b/tests/internals/test_internals.c index 53f9872..23fa192 100644 --- a/tests/internals/test_internals.c +++ b/tests/internals/test_internals.c @@ -6,7 +6,7 @@ #include <string.h> #include <stdlib.h> -static void arena_suite() +static void arena_suite(void) { const int iterations = 1000; struct arena arena; @@ -55,7 +55,7 @@ static void test_path_starts_with(const char* path, const char* prefix, bool exp } } -static void my_dirname_suite() +static void my_dirname_suite(void) { char buf[256]; @@ -90,7 +90,7 @@ static void my_dirname_suite() test_my_dirname(buf, ".."); } -static void path_starts_with_suite() +static void path_starts_with_suite(void) { test_path_starts_with("/a/b/c", "/a/b", true); test_path_starts_with("/a/b/c", "/a/b/", true); @@ -144,7 +144,7 @@ static void path_starts_with_suite() test_path_starts_with("/a/b/c", "/", true); } -static void sprintf_new_suite() { +static void sprintf_new_suite(void) { char *result; result = sprintf_new("Hello %d %s", 123, "World"); @@ -214,7 +214,7 @@ static void filter_o_opts_test(const char **init, const char **expected) { free(joined_input); } -static void filter_o_opts_suite() { +static void filter_o_opts_suite(void) { { const char *in[] = {"-obad1", NULL}; const char *exp[] = {NULL}; @@ -299,7 +299,7 @@ static void filter_o_opts_suite() { } } -static void test_internal_suite() { +static void test_internal_suite(void) { arena_suite(); my_dirname_suite(); path_starts_with_suite(); diff --git a/tests/internals/test_rate_limiter.c b/tests/internals/test_rate_limiter.c index 09b219e..25e26fb 100644 --- a/tests/internals/test_rate_limiter.c +++ b/tests/internals/test_rate_limiter.c @@ -6,12 +6,12 @@ static const double epsilon = 0.000000000001; static volatile double time_now = 123123.0; -double test_clock() +double test_clock(void) { return time_now; } -void computes_correct_sleep_times() +void computes_correct_sleep_times(void) { time_now = 123123.0; RateLimiter limiter; @@ -29,7 +29,7 @@ void computes_correct_sleep_times() rate_limiter_destroy(&limiter); } -void works_after_being_idle() +void works_after_being_idle(void) { time_now = 123123.0; RateLimiter limiter; @@ -45,7 +45,7 @@ void works_after_being_idle() rate_limiter_destroy(&limiter); } -void sleeps_correct_amount() +void sleeps_correct_amount(void) { RateLimiter limiter; rate_limiter_init(&limiter, 10, &gettimeofday_clock); @@ -58,7 +58,7 @@ void sleeps_correct_amount() rate_limiter_destroy(&limiter); } -void rate_limiter_suite() +void rate_limiter_suite(void) { computes_correct_sleep_times(); works_after_being_idle(); diff --git a/tests/odirect_read.c b/tests/odirect_read.c index 8fc746b..42d5b79 100644 --- a/tests/odirect_read.c +++ b/tests/odirect_read.c @@ -51,7 +51,7 @@ int main(int argc, char** argv) { #include <stdio.h> -int main() { +int main(void) { fprintf(stderr, "Not supported on this platform.\n"); return 1; } diff --git a/tests/odirect_write.c b/tests/odirect_write.c index bc9040f..11dde43 100644 --- a/tests/odirect_write.c +++ b/tests/odirect_write.c @@ -32,7 +32,6 @@ int main(int argc, char** argv) { return 1; } - size_t total_size = 0; while (1) { if (feof(stdin)) { break; @@ -48,8 +47,6 @@ int main(int argc, char** argv) { continue; } - total_size += amt_read; - ssize_t res = write(fd, buf, buf_size); if (res == -1) { perror("failed to write"); @@ -70,7 +67,7 @@ int main(int argc, char** argv) { #include <stdio.h> -int main() { +int main(void) { fprintf(stderr, "Not supported on this platform.\n"); return 1; } diff --git a/tests/test_dir_rewind.c b/tests/test_dir_rewind.c index 6ae0497..d2d9d2a 100644 --- a/tests/test_dir_rewind.c +++ b/tests/test_dir_rewind.c @@ -17,7 +17,7 @@ #define BUF_SIZE 4096 -int main() +int main(void) { int fd = open(".", O_RDONLY | O_DIRECTORY); if (fd == -1) { @@ -72,7 +72,7 @@ int main() #include <stdio.h> -int main() +int main(void) { printf("This test currently only compiles on Linux/amd64.\n"); printf("Skipping by just returning successfully.\n"); |