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

Merge pull request #16 from skysql/testing_makefile_fix

Browse Source 
Testing makefile fix
This commit is contained in:
Vilho Raatikka
2014-08-13 10:46:40 +03:00
parent e84f7a0a00 430cd8d140
commit ccdf326d07
3 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/test/makefile
View File

@ -32,11 +32,7 @@ runtests:
@echo $(shell date) >> $(TESTLOG) @echo $(shell date) >> $(TESTLOG)
@echo "Test MaxScale core" >> $(TESTLOG) @echo "Test MaxScale core" >> $(TESTLOG)
@echo "-------------------------------" >> $(TESTLOG) @echo "-------------------------------" >> $(TESTLOG)
@ -./testhash 2>> $(TESTLOG) @-./testhash 2>> $(TESTLOG)
ifeq ($?,0) if [ "$$?" == "0" ];then echo "MaxScale core PASSED">> $(TESTLOG);else echo "MaxScale core FAILED">> $(TESTLOG);fi
@echo "MaxScale core PASSED" >> $(TESTLOG)
else
@echo "MaxScale core FAILED" >> $(TESTLOG)
endif
@echo "" >> $(TESTLOG) @echo "" >> $(TESTLOG)
@cat $(TESTLOG) >> $(TEST_MAXSCALE_LOG) @cat $(TESTLOG) >> $(TEST_MAXSCALE_LOG)

4
server/modules/routing/Makefile
View File

@ -94,19 +94,15 @@ install: $(MODULES)
(cd readwritesplit; make DEST=$(DEST) install) (cd readwritesplit; make DEST=$(DEST) install)
cleantests: cleantests:
$(MAKE) -C readwritesplit/test cleantests
$(MAKE) -C test cleantests $(MAKE) -C test cleantests
buildtests: buildtests:
$(MAKE) -C readwritesplit/test DEBUG=Y buildtests
$(MAKE) -C test DEBUG=Y buildtests $(MAKE) -C test DEBUG=Y buildtests
runtests: runtests:
$(MAKE) -C test runtests $(MAKE) -C test runtests
$(MAKE) -C readwritesplit runtests
testall: testall:
$(MAKE) -C test testall $(MAKE) -C test testall
$(MAKE) -C readwritesplit testall
include depend.mk include depend.mk

6
server/modules/routing/readwritesplit/test/test_hints/syntax_check.sh
View File

@ -21,10 +21,10 @@ fi
./rwsplit_hints.sh dummy.log $THOST $TPORT $TMASTER_ID $TUSER $TPWD $TESTINPUT ./rwsplit_hints.sh dummy.log $THOST $TPORT $TMASTER_ID $TUSER $TPWD $TESTINPUT
exp_count=`cat error_tests | grep -c '.*'` exp_count=`cat error_tests|wc -l`
err_count=`tail -n $exp_count ../../../../../test/log/skygw_err*|grep -c 'Hint ignored'` err_count=`tac ../../../../../test/log/skygw_err* | gawk '/enabled/{if(!bg){ bg = 1} else exit 0}{if(bg) print}'|grep -c 'Hint ignored'`
if [ "$err_count" == "$exp_count" ] if [[ $err_count -ge $exp_count ]]
then then
echo "Test set: PASSED">>$TLOG; echo "Test set: PASSED">>$TLOG;
else else