hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed how MaxScale unit test works.

Browse Source 
All tests are run by executing 'make testall' in root directory. As a result all directories which contain tests will be entered and tests executed.
After tests, each directory have a test log including the last run's logs only.
Created a global test log, which is specified in test.inc. Test logs from subdirectories are concatenated to this file.
This commit is contained in:
VilhoRaatikka
2014-04-10 19:08:28 +03:00
parent b9a8f2ce65
commit 7b40c1ee70
7 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
log_manager/test/makefile
View File

@ -5,6 +5,7 @@
include ../../build_gateway.inc include ../../build_gateway.inc
include ../../makefile.inc include ../../makefile.inc
include ../../test.inc
CC = gcc CC = gcc
CPP = g++ CPP = g++
@ -43,7 +44,7 @@ buildtests:
runtests: runtests:
@echo "" >> $(TESTLOG) @echo "" > $(TESTLOG)
@echo "-------------------------------" >> $(TESTLOG) @echo "-------------------------------" >> $(TESTLOG)
@echo $(shell date) >> $(TESTLOG) @echo $(shell date) >> $(TESTLOG)
@echo "Test Log Manager" >> $(TESTLOG) @echo "Test Log Manager" >> $(TESTLOG)
@ -62,3 +63,5 @@ runtests:
@-$(LAUNCH_DEBUGGER) $(TESTAPP) "-t 16" 2>>$(TESTLOG) @-$(LAUNCH_DEBUGGER) $(TESTAPP) "-t 16" 2>>$(TESTLOG)
@echo "Log Manager PASSED" >> $(TESTLOG) @echo "Log Manager PASSED" >> $(TESTLOG)
@echo "" >> $(TESTLOG) @echo "" >> $(TESTLOG)
# @cat $(TESTLOG) >> $(TEST_MAXSCALE_LOG)

4
query_classifier/test/makefile
View File

@ -5,6 +5,7 @@
include ../../build_gateway.inc include ../../build_gateway.inc
include ../../makefile.inc include ../../makefile.inc
include ../../test.inc
CC = gcc CC = gcc
CPP = g++ CPP = g++
@ -48,7 +49,7 @@ buildtests:
$(LDLIBS) $(LDMYSQL) $(LDLIBS) $(LDMYSQL)
runtests: runtests:
@echo "" >> $(TESTLOG) @echo "" > $(TESTLOG)
@echo "-------------------------------" >> $(TESTLOG) @echo "-------------------------------" >> $(TESTLOG)
@echo $(shell date) >> $(TESTLOG) @echo $(shell date) >> $(TESTLOG)
@echo "Test Query Classifier" >> $(TESTLOG) @echo "Test Query Classifier" >> $(TESTLOG)
@ -59,3 +60,4 @@ ifeq ($?, 0)
else else
@echo "Query Classifier FAILED" >> $(TESTLOG) @echo "Query Classifier FAILED" >> $(TESTLOG)
endif endif
@cat $(TESTLOG) >> $(TEST_MAXSCALE_LOG)

4
server/core/test/makefile
View File

@ -5,6 +5,7 @@
include ../../../build_gateway.inc include ../../../build_gateway.inc
include ../../../makefile.inc include ../../../makefile.inc
include ../../../test.inc
CC=cc CC=cc
TESTLOG := $(shell pwd)/testhash.log TESTLOG := $(shell pwd)/testhash.log
@ -26,7 +27,7 @@ buildtests :
testhash.c ../hashtable.o ../atomic.o ../spinlock.o -o testhash testhash.c ../hashtable.o ../atomic.o ../spinlock.o -o testhash
runtests: runtests:
@echo "" >> $(TESTLOG) @echo "" > $(TESTLOG)
@echo "-------------------------------" >> $(TESTLOG) @echo "-------------------------------" >> $(TESTLOG)
@echo $(shell date) >> $(TESTLOG) @echo $(shell date) >> $(TESTLOG)
@echo "Test MaxScale core" >> $(TESTLOG) @echo "Test MaxScale core" >> $(TESTLOG)
@ -38,3 +39,4 @@ else
@echo "MaxScale core FAILED" >> $(TESTLOG) @echo "MaxScale core FAILED" >> $(TESTLOG)
endif endif
@echo "" >> $(TESTLOG) @echo "" >> $(TESTLOG)
@cat $(TESTLOG) >> $(TEST_MAXSCALE_LOG)

7
server/modules/routing/readwritesplit/test/makefile
View File

@ -8,7 +8,7 @@ include $(ROOT_PATH)/makefile.inc
include $(ROOT_PATH)/test.inc include $(ROOT_PATH)/test.inc
CC=cc CC=cc
TESTLOG := $(shell pwd)/testrouters.log TESTLOG := $(shell pwd)/testrwsplit.log
RET := -1 RET := -1
cleantests: cleantests:
@ -25,12 +25,11 @@ buildtests:
runtests: runtests:
@echo "" >> $(TESTLOG) @echo "" > $(TESTLOG)
@echo "-------------------------------" >> $(TESTLOG) @echo "-------------------------------" >> $(TESTLOG)
@echo $(shell date) >> $(TESTLOG) @echo $(shell date) >> $(TESTLOG)
@echo "Test Read/Write split router" >> $(TESTLOG) @echo "Test Read/Write split router" >> $(TESTLOG)
@echo "-------------------------------" >> $(TESTLOG) @echo "-------------------------------" >> $(TESTLOG)
./rwsplit.sh $(TESTLOG) $(THOST) $(TPORT_RW) $(TMASTER_ID) $(TUSER) $(TPWD) ./rwsplit.sh $(TESTLOG) $(THOST) $(TPORT_RW) $(TMASTER_ID) $(TUSER) $(TPWD)
@echo "" >> $(TESTLOG) @echo "" >> $(TESTLOG)
@cat $(TESTLOG) >> $(TEST_MAXSCALE_LOG)

5
server/test/makefile
View File

@ -5,6 +5,7 @@
include ../../build_gateway.inc include ../../build_gateway.inc
include ../../makefile.inc include ../../makefile.inc
include ../../test.inc
TEST_ROOT := $(ROOT_PATH)/test TEST_ROOT := $(ROOT_PATH)/test
PARENT_DIR := $(ROOT_PATH)/server PARENT_DIR := $(ROOT_PATH)/server
@ -58,7 +59,7 @@ else
endif endif
runtests: runtests:
@echo "" >> $(TESTLOG) @echo "" > $(TESTLOG)
@echo "-------------------------------" >> $(TESTLOG) @echo "-------------------------------" >> $(TESTLOG)
@echo $(shell date) >> $(TESTLOG) @echo $(shell date) >> $(TESTLOG)
@echo "Test MaxScale server" >> $(TESTLOG) @echo "Test MaxScale server" >> $(TESTLOG)
@ -70,4 +71,4 @@ runtests:
@sleep 5 @sleep 5
@echo "MaxScale server PASSED" >> $(TESTLOG) @echo "MaxScale server PASSED" >> $(TESTLOG)
@echo "" >> $(TESTLOG) @echo "" >> $(TESTLOG)
@cat $(TESTLOG) >> $(TEST_MAXSCALE_LOG)

6
test.inc
View File

@ -33,3 +33,9 @@ TPWD :=
# TMASTER_ID := 2 # TMASTER_ID := 2
# #
TMASTER_ID := TMASTER_ID :=
#
# Global test log where all log is gathered
# TEST_MAXSCALE_LOG := $(ROOT_PATH)/test/test_maxscale.log
#
TEST_MAXSCALE_LOG :=

6
test/makefile
View File

@ -5,11 +5,12 @@
include ../build_gateway.inc include ../build_gateway.inc
include ../makefile.inc include ../makefile.inc
include ../test.inc
export MAXSCALE_HOME=$(shell pwd)/MaxScale export MAXSCALE_HOME=$(shell pwd)/MaxScale
CC=cc CC=cc
TESTLOG := $(shell pwd)/testmaxscale.log TESTLOG := $(TEST_MAXSCALE_LOG)
testall: testall:
$(MAKE) cleantests $(MAKE) cleantests
@ -55,9 +56,10 @@ buildtests:
$(MAKE) -C $(ROOT_PATH)/utils buildtests $(MAKE) -C $(ROOT_PATH)/utils buildtests
runtests: runtests:
@echo "" >> $(TESTLOG) @echo "" > $(TESTLOG)
@echo "-------------------------------" >> $(TESTLOG) @echo "-------------------------------" >> $(TESTLOG)
@echo $(shell date) >> $(TESTLOG) @echo $(shell date) >> $(TESTLOG)
@echo "Test MaxScale root" >> $(TESTLOG) @echo "Test MaxScale root" >> $(TESTLOG)
@echo "-------------------------------" >> $(TESTLOG) @echo "-------------------------------" >> $(TESTLOG)
@echo "Nothing to run here so far" >> $(TESTLOG) @echo "Nothing to run here so far" >> $(TESTLOG)