diff options
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/Makefile.in | 12 | ||||
| -rw-r--r-- | src/test/test_spinlock.c | 25 |
2 files changed, 15 insertions, 22 deletions
diff --git a/src/test/Makefile.in b/src/test/Makefile.in index dea126e46..8f999fb37 100644 --- a/src/test/Makefile.in +++ b/src/test/Makefile.in @@ -9,18 +9,20 @@ CONFIG_H = $(wildcard $(CONFIG_D)/*.h) $(wildcard $(CONFIG_D)/*/*.h) COMMON_D = ../common COMMON_H = $(wildcard $(COMMON_D)/*.h) SYSINFO_INC = $(COMMON_D)/sysinfo.inc +COMMON_INCLUDE = -I.. -LIBCONFIG_D = ../../3rdparty/libconfig +THIRDPARTY_D = ../../3rdparty +THIRDPARTY_INCLUDE = -I$(THIRDPARTY_D) + +LIBCONFIG_D = $(THIRDPARTY_D)/libconfig LIBCONFIG_OBJ = $(addprefix $(LIBCONFIG_D)/, libconfig.o grammar.o scanctx.o \ scanner.o strbuf.o) LIBCONFIG_H = $(addprefix $(LIBCONFIG_D)/, libconfig.h grammar.h parsectx.h \ scanctx.h scanner.h strbuf.h wincompat.h) -LIBCONFIG_INCLUDE = -I$(LIBCONFIG_D) -MT19937AR_D = ../../3rdparty/mt19937ar +MT19937AR_D = $(THIRDPARTY_D)/mt19937ar MT19937AR_OBJ = $(MT19937AR_D)/mt19937ar.o MT19937AR_H = $(MT19937AR_D)/mt19937ar.h -MT19937AR_INCLUDE = -I$(MT19937AR_D) TEST_SPINLOCK_OBJ = obj/test_spinlock.o TEST_SPINLOCK_C = test_spinlock.c @@ -70,7 +72,7 @@ test_spinlock: $(TEST_SPINLOCK_DEPENDS) Makefile obj/%.o: %.c $(TEST_SPINLOCK_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj @echo " CC $<" - @$(CC) @CFLAGS@ @DEFS@ $(MT19937AR_INCLUDE) $(LIBCONFIG_INCLUDE) -DWITH_SQL @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< + @$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) -DWITH_SQL @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $< # missing object files $(COMMON_D)/obj_all/common.a: diff --git a/src/test/test_spinlock.c b/src/test/test_spinlock.c index 19ae9aee7..a11f8643b 100644 --- a/src/test/test_spinlock.c +++ b/src/test/test_spinlock.c @@ -1,9 +1,11 @@ +#define HERCULES_CORE -#include "../common/core.h" -#include "../common/atomic.h" -#include "../common/thread.h" -#include "../common/spinlock.h" -#include "../common/showmsg.h" +#include "common/atomic.h" +#include "common/cbasetypes.h" +#include "common/core.h" +#include "common/thread.h" +#include "common/spinlock.h" +#include "common/showmsg.h" #include <stdio.h> #include <stdlib.h> @@ -12,13 +14,10 @@ // Simple test for the spinlock implementation to see if it works properly.. // - - #define THRC 32 //thread Count #define PERINC 100000 #define LOOPS 47 - static SPIN_LOCK lock; static unsigned int val = 0; static volatile int32 done_threads = 0; @@ -41,7 +40,6 @@ static void *worker(void *p){ return NULL; }//end: worker() - int do_init(int argc, char **argv){ rAthread *t[THRC]; int j, i; @@ -88,27 +86,20 @@ int do_init(int argc, char **argv){ ShowStatus("Test passed.\n"); exit(0); } - - -return 0; + return 0; }//end: do_init() - void do_abort(void) { }//end: do_abort() - void set_server_type(void) { SERVER_TYPE = SERVER_TYPE_UNKNOWN; }//end: set_server_type() - int do_final(void) { return EXIT_SUCCESS; }//end: do_final() - int parse_console(const char* command){ return 0; }//end: parse_console - |