Commit eff00002 authored by unknown's avatar unknown
Browse files

change test targets to be more modular. include unit tests into make test

parent b19c1896

Makefile.am

+24 −19
Original line number Diff line number Diff line
@@ -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,29 +113,34 @@ 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
@@ -141,8 +148,6 @@ 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.%