diff options
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/Makefile.in | 4 | ||||
| -rw-r--r-- | src/test/test_libconfig.c | 6 | ||||
| -rw-r--r-- | src/test/test_spinlock.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/test/Makefile.in b/src/test/Makefile.in index 6d2187733..c8006e5cf 100644 --- a/src/test/Makefile.in +++ b/src/test/Makefile.in @@ -1,7 +1,7 @@ # This file is part of Hercules. # http://herc.ws - http://github.com/HerculesWS/Hercules # -# Copyright (C) 2012-2015 Hercules Dev Team +# Copyright (C) 2012-2016 Hercules Dev Team # Copyright (C) Athena Dev Teams # # Hercules is free software: you can redistribute it and/or modify @@ -23,7 +23,7 @@ CONFIG_D = ../config CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h) COMMON_D = ../common -COMMON_H = $(wildcard $(COMMON_D)/*.h) +COMMON_H = $(filter-out %.p.h, $(wildcard $(COMMON_D)/*.h)) SYSINFO_INC = $(COMMON_D)/sysinfo.inc COMMON_INCLUDE = -I.. diff --git a/src/test/test_libconfig.c b/src/test/test_libconfig.c index a3b233b98..e0a470e21 100644 --- a/src/test/test_libconfig.c +++ b/src/test/test_libconfig.c @@ -113,6 +113,7 @@ static const char *test_libconfig_read(void) libconfig->destroy(&config); return "Unable to read from file '" FILENAME "'."; } + fclose(fp); #undef FILENAME if (config.root == NULL) { libconfig->destroy(&config); @@ -200,7 +201,6 @@ static const char *test_libconfig_set_include_dir(void) static const char *test_libconfig_lookup(void) { struct config_t config; - struct config_setting_t *t = NULL; int32 i32; int64 i64; double f; @@ -221,12 +221,12 @@ static const char *test_libconfig_lookup(void) return "Unable to parse configuration."; } - if ((t = libconfig->lookup(&config, "Setting_Int")) == NULL) { + if (libconfig->lookup(&config, "Setting_Int") == NULL) { libconfig->destroy(&config); return "libconfig->lookup failed."; } - if ((t = libconfig->setting_lookup(config.root, "Setting_Int")) == NULL) { + if (libconfig->setting_lookup(config.root, "Setting_Int") == NULL) { libconfig->destroy(&config); return "libconfig->setting_lookup failed."; } diff --git a/src/test/test_spinlock.c b/src/test/test_spinlock.c index 38186a975..6ffc4eafc 100644 --- a/src/test/test_spinlock.c +++ b/src/test/test_spinlock.c @@ -91,9 +91,9 @@ int do_init(int argc, char **argv){ // Everything fine? if (val != (THRC*PERINC)) { - printf("FAILED! (Result: %u, Expected: %u)\n", val, (THRC*PERINC)); + printf("FAILED! (Result: %u, Expected: %d)\n", val, (THRC*PERINC)); } else { - printf("OK! (Result: %u, Expected: %u)\n", val, (THRC*PERINC)); + printf("OK! (Result: %u, Expected: %d)\n", val, (THRC*PERINC)); ok++; } |