mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
Makefile.am:
Option to set environment variable MTR_BUILD_THREAD to a small number, from what mysql-test-run calculate port numbers that will not conflict with other runs with different thread num
This commit is contained in:
parent
c93927eef0
commit
257b17ba2f
2 changed files with 25 additions and 9 deletions
17
Makefile.am
17
Makefile.am
|
@ -85,15 +85,14 @@ tags:
|
||||||
support-files/build-tags
|
support-files/build-tags
|
||||||
.PHONY: init-db bin-dist
|
.PHONY: init-db bin-dist
|
||||||
|
|
||||||
# Test installation. Ports are configurable from the environment.
|
# Target 'test' will run the regression test suite using the built server.
|
||||||
|
#
|
||||||
MYSQL_TEST_MANAGER_PORT = 9305
|
# If you are running in a shared environment, users can avoid clashing
|
||||||
MYSQL_TEST_MASTER_PORT = 9306
|
# port numbers by setting individual small numbers 1-100 to the
|
||||||
MYSQL_TEST_SLAVE_PORT = 9308
|
# environment variable MTR_BUILD_THREAD. The script "mysql-test-run"
|
||||||
|
# will then calculate the various port numbers it needs from this,
|
||||||
|
# making sure each user use different ports.
|
||||||
|
|
||||||
test:
|
test:
|
||||||
cd mysql-test ; \
|
cd mysql-test ; \
|
||||||
./mysql-test-run \
|
./mysql-test-run
|
||||||
--manager-port=$(MYSQL_TEST_MANAGER_PORT) \
|
|
||||||
--master_port=$(MYSQL_TEST_MASTER_PORT) \
|
|
||||||
--slave_port=$(MYSQL_TEST_SLAVE_PORT)
|
|
||||||
|
|
|
@ -201,6 +201,23 @@ MYSQL_MANAGER_PORT=9305 # needs to be out of the way of slaves
|
||||||
MYSQL_MANAGER_PW_FILE=$MYSQL_TEST_DIR/var/tmp/manager.pwd
|
MYSQL_MANAGER_PW_FILE=$MYSQL_TEST_DIR/var/tmp/manager.pwd
|
||||||
MYSQL_MANAGER_LOG=$MYSQL_TEST_DIR/var/log/manager.log
|
MYSQL_MANAGER_LOG=$MYSQL_TEST_DIR/var/log/manager.log
|
||||||
MYSQL_MANAGER_USER=root
|
MYSQL_MANAGER_USER=root
|
||||||
|
|
||||||
|
#
|
||||||
|
# To make it easier for different devs to work on the same host,
|
||||||
|
# an environment variable can be used to control all ports. A small
|
||||||
|
# number is to be used, 0 - 16 or similar.
|
||||||
|
#
|
||||||
|
if [ -n "$MTR_BUILD_THREAD" ] ; then
|
||||||
|
MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 40 + 8120`
|
||||||
|
SLAVE_MYPORT=`expr $MASTER_MYPORT + 16`
|
||||||
|
MYSQL_MANAGER_PORT=`expr $MASTER_MYPORT + 2`
|
||||||
|
|
||||||
|
echo "Using MTR_BUILD_THREAD = $MTR_BUILD_THREAD"
|
||||||
|
echo "Using MASTER_MYPORT = $MASTER_MYPORT"
|
||||||
|
echo "Using MYSQL_MANAGER_PORT = $MYSQL_MANAGER_PORT"
|
||||||
|
echo "Using SLAVE_MYPORT = $SLAVE_MYPORT"
|
||||||
|
fi
|
||||||
|
|
||||||
NO_SLAVE=0
|
NO_SLAVE=0
|
||||||
USER_TEST=
|
USER_TEST=
|
||||||
FAILED_CASES=
|
FAILED_CASES=
|
||||||
|
|
Loading…
Add table
Reference in a new issue