bk commit into 5.1 tree (joerg:1.2623)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-07 11:54:59+01:00, joerg@trift2. +1 -0
  Makefile.am
      In the "test-bt" target, replace the call "$(MAKE) test-embedded" by the actions of that target.

  Makefile.am@stripped, 2007-12-07 11:54:55+01:00, joerg@trift2. +8 -1
    In the "test-bt" target, replace the call "$(MAKE) test-embedded" by the actions of that target.
    
    Reason:
    For release builds, we run the tests in a tree that contains just a binary installation.
    So the Makefile is not in the test tree, and we explicitly address it in the build tree.
    This explicit path is not kept by "make", so it is missing in the sub-make.
    There seems to be no way to solve this with (portable!) "make" features -
    we could add a new variable and use it in the sub-make, but it is easier to duplicate these few lines.

diff -Nrup a/Makefile.am b/Makefile.am
--- a/Makefile.am	2007-11-28 17:36:26 +01:00
+++ b/Makefile.am	2007-12-07 11:54:55 +01:00
@@ -102,6 +102,7 @@ test-binlog-statement:
 	@PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement
 
 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 \
 	  cd mysql-test ; MTR_BUILD_THREAD=auto \
 	  @PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \
@@ -140,7 +141,13 @@ test-bt:
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
 	@PERL@ ./mysql-test-run.pl --comment=NDB            --force --timer \
 	--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 \
 	@PERL@ ./mysql-test-run.pl --force --comment=funcs1_ps --ps-protocol --suite=funcs_1
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \