Commit 2cf168d6 authored by joerg@trift2's avatar joerg@trift2

Makefile.am

    In the "test-bt" target, replace the call "$(MAKE) test-embedded" by the actions of that target.
parent 45307504
...@@ -102,6 +102,7 @@ test-binlog-statement: ...@@ -102,6 +102,7 @@ test-binlog-statement:
@PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement @PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement
test-embedded: test-embedded:
# This code is duplicated in "test-bt", see the Changeset comment of 2007-Dec-07
if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \ if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
cd mysql-test ; MTR_BUILD_THREAD=auto \ cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \ @PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \
...@@ -140,7 +141,13 @@ test-bt: ...@@ -140,7 +141,13 @@ test-bt:
-cd mysql-test ; MTR_BUILD_THREAD=auto \ -cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --comment=NDB --force --timer \ @PERL@ ./mysql-test-run.pl --comment=NDB --force --timer \
--with-ndbcluster-only --with-ndbcluster-only
-$(MAKE) test-embedded -if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \
--embedded-server --skip-rpl --skip-ndbcluster ; \
else \
echo "no program found for 'embedded' tests - skipped testing" ; \
fi
-cd mysql-test ; MTR_BUILD_THREAD=auto \ -cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --force --comment=funcs1_ps --ps-protocol --suite=funcs_1 @PERL@ ./mysql-test-run.pl --force --comment=funcs1_ps --ps-protocol --suite=funcs_1
-cd mysql-test ; MTR_BUILD_THREAD=auto \ -cd mysql-test ; MTR_BUILD_THREAD=auto \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment