diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 9025251ff2a..3be3ce80b71 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,19 +20,19 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ +SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ @readline_topdir@ sql-common \ @thread_dirs@ pstack \ @sql_union_dirs@ scripts @man_dirs@ tests \ netware @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ + @bench_dirs@ support-files @tools_dirs@ DIST_SUBDIRS = . include @docs_dirs@ zlib \ @readline_topdir@ sql-common \ @thread_dirs@ pstack \ @sql_union_dirs@ scripts @man_dirs@ tests SSL\ BUILD netware os2 @libmysqld_dirs@ \ - @bench_dirs@ support-files @fs_dirs@ @tools_dirs@ + @bench_dirs@ support-files @tools_dirs@ # Relink after clean linked_sources = linked_client_sources linked_server_sources \ @@ -103,7 +103,10 @@ MYSQL_TEST_MANAGER_PORT = 9305 MYSQL_TEST_MASTER_PORT = 9306 MYSQL_TEST_SLAVE_PORT = 9308 MYSQL_TEST_NDB_PORT = 9350 - +MYSQL_TEST_RUN_ARGS = --manager-port=$(MYSQL_TEST_MANAGER_PORT) \ + --master_port=$(MYSQL_TEST_MASTER_PORT) \ + --slave_port=$(MYSQL_TEST_SLAVE_PORT) \ + --ndbcluster_port=$(MYSQL_TEST_NDB_PORT) test: cd mysql-test ; \ ./mysql-test-run \ @@ -121,14 +124,3 @@ test-force: cd mysql-test; \ ./mysql-test-run --force ;\ ./mysql-test-run --ps-protocol --force - -# We are testing a new Perl version of the test script -test-pl: - cd mysql-test; \ - ./mysql-test-run.pl && \ - ./mysql-test-run.pl --ps-protocol - -test-force-pl: - cd mysql-test; \ - ./mysql-test-run.pl --force ; \ - ./mysql-test-run.pl --ps-protocol --force |