Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0

into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0
55d159ce · paul@frost.snake.net · 351c59cb · e2954b29 · 55d159ce
Commit 55d159ce authored Aug 29, 2005 by paul@frost.snake.net
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

Makefile.am Makefile.am +10 -3

No files found.
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,8 +85,15 @@ tags:
 	support-files/build-tags
 .PHONY:		init-db bin-dist
-# Test installation
+# Test installation. Ports are configurable from the environment.
-test:
+MYSQL_TEST_MANAGER_PORT =	9305
-	cd mysql-test ; ./mysql-test-run
+MYSQL_TEST_MASTER_PORT =	9306
+MYSQL_TEST_SLAVE_PORT =		9308
+test:
+	cd mysql-test ; \
+	./mysql-test-run \
+		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \
+		--master_port=$(MYSQL_TEST_MASTER_PORT) \
+		--slave_port=$(MYSQL_TEST_SLAVE_PORT)