Changed the order of linking in test_mysql_users and removed references to non-existing directories in test.inc

server/core/test/CMakeLists.txt

@@ -11,7 +11,7 @@ add_executable(test_service testservice.c)
 add_executable(test_server testserver.c)
 add_executable(test_users testusers.c)
 add_executable(test_adminusers testadminusers.c)
-target_link_libraries(test_mysql_users fullcore MySQLClient)
+target_link_libraries(test_mysql_users MySQLClient fullcore)
 target_link_libraries(test_hash fullcore)
 target_link_libraries(test_hint fullcore)
 target_link_libraries(test_spinlock fullcore)

server/core/test/makefile

@@ -42,6 +42,13 @@ testhash: testhash.c
 	-I$(ROOT_PATH)/utils \
 	testhash.c ../hashtable.o ../atomic.o ../spinlock.o -o testhash
 
+testmysqlusers: test_mysql_users.c 
+	$(CC) $(CFLAGS) \
+	-I$(ROOT_PATH)/server/include \
+	-I$(ROOT_PATH)/utils \
+	test_mysql_users.c ../hashtable.o ../atomic.o ../modutil.o ../spinlock.o -o testmysqlusers
+
+
 testspinlock: testspinlock.c 
 	$(CC) $(CFLAGS) \
 	-I$(ROOT_PATH)/server/include \

server/modules/routing/Makefile

@@ -29,7 +29,7 @@ UTILSPATH := $(ROOT_PATH)/utils
 
 CC=cc
 CFLAGS=-c -fPIC -I/usr/include -I../include -I../../include -I$(LOGPATH) \
-	-I$(UTILSPATH) -Wall -g
+	-I$(UTILSPATH) -I$(MYSQL_HEADERS) -Wall -g
 
 include ../../../makefile.inc
 

test.inc

@@ -43,5 +43,5 @@ TMASTER_ID      :=
 # Global test log where all log is gathered
 # TEST_MAXSCALE_LOG   := $(ROOT_PATH)/test/test_maxscale.log
 #
-TEST_MAXSCALE_LOG   := /home/mbrampton/Dropbox/skygit/MaxScale/test/testserver.log
+TEST_MAXSCALE_LOG   :=