improved 'make check'; now it stops and starts the scheduler correctly

This commit is contained in:
fgerlits 2006-08-08 11:23:49 +00:00
parent f727b48e10
commit 9f8b25d9f8

View file

@ -335,7 +335,7 @@ depclean: clean
distclean: clean docclean distclean: clean docclean
${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te* ${TMP_DIR}/ac*.m4 ${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te* ${TMP_DIR}/ac*.m4
check: all ${TEST_RUNNER} storage_server_init stop start run_tests stop check: all ${TEST_RUNNER} storage_server_init kill start run_tests stop
install: all copy_files create_database create_odbc_datasource init_database install: all copy_files create_database create_odbc_datasource init_database
@ -377,7 +377,7 @@ ifeq (@INIT_LS_DATABASE@,yes)
endif endif
check_local: all ${TEST_RUNNER} stop_local start_local run_tests stop_local check_local: all ${TEST_RUNNER} kill start_local run_tests stop_local
run_tests: ${TEST_RUNNER} run_tests: ${TEST_RUNNER}
${TEST_RUNNER_SH} -o ${TEST_RESULTS} -s ${TEST_XSLT} ${TEST_RUNNER_SH} -o ${TEST_RESULTS} -s ${TEST_XSLT}
@ -427,9 +427,9 @@ storage_server_init:
${MAKE} -C ${STORAGE_SERVER_DIR} ${MAKE} -C ${STORAGE_SERVER_DIR}
kill: kill:
${KILLALL} scheduler ${KILLALL} scheduler || true
sleep 2 sleep 2
${KILLALL} -9 scheduler ${KILLALL} -9 scheduler || true
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------