bk commit into 5.1 tree (serg:1.2188)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg 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
  1.2188 06/06/14 09:12:37 serg@stripped +1 -0
  change test targets to be more modular. include unit tests into make test

  Makefile.am
    1.94 06/06/14 09:12:16 serg@stripped +24 -19
    change test targets to be more modular. include unit tests into make test

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/m51

--- 1.93/Makefile.am	Fri May 12 10:51:01 2006
+++ 1.94/Makefile.am	Wed Jun 14 09:12:16 2006
@@ -101,7 +101,9 @@ dist-hook:
 
 tags:
 	support-files/build-tags
-.PHONY:		init-db bin-dist
+
+.PHONY:	init-db bin-dist test test-full test-ps test-nr \
+	test-ns test-pr test-unit
 
 # Target 'test' will run the regression test suite using the built server.
 #
@@ -111,37 +113,40 @@ tags:
 # will then calculate the various port numbers it needs from this,
 # making sure each user use different ports.
 
-test:
+test-unit:
+	cd unittest && $(MAKE) test
+
+test-ps:
 	cd mysql-test ; \
-	./mysql-test-run.pl --mysqld=--binlog-format=statement && \
-	./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row
+	./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=statement
 
-test-full:
+test-nr:
 	cd mysql-test ; \
-	./mysql-test-run.pl --mysqld=--binlog-format=statement && \
-	./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=statement && \
-	./mysql-test-run.pl --mysqld=--binlog-format=row && \
-	./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row
+	./mysql-test-run.pl $(force) --mysqld=--binlog-format=row
 
-test-force:
+test-pr:
 	cd mysql-test ; \
-	./mysql-test-run.pl --force --mysqld=--binlog-format=statement && \
-	./mysql-test-run.pl --ps-protocol --force --mysqld=--binlog-format=row
+	./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=row
 
-test-force-full:
+test-ns:
 	cd mysql-test ; \
-	./mysql-test-run.pl --force --mysqld=--binlog-format=statement && \
-	./mysql-test-run.pl --force --ps-protocol --mysqld=--binlog-format=statement && \
-	./mysql-test-run.pl --force --mysqld=--binlog-format=row && \
-	./mysql-test-run.pl --force --ps-protocol --mysqld=--binlog-format=row
+	./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement
+
+test:	test-unit test-ns test-pr
+
+test-full:	test test-nr test-ps
+
+test-force:
+	$(MAKE) force=--force test
+
+test-force-full:
+	$(MAKE) force=--force test-full
 
 # Keep these for a while
 test-pl:	test
 test-full-pl:	test-full
 test-force-pl:	test-force
 test-force-full-pl: test-force-full
-
-
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%