Commit 2df738f3 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
Makefile.am:
  Manual merge
parents b727e09c 1eb70558

Makefile.am

+3 −15
Original line number Diff line number Diff line
@@ -124,22 +124,10 @@ test-force: 
	./mysql-test-run --force && \

	./mysql-test-run --ps-protocol --force



# We are testing a new Perl version of the test script

test-pl:

test-force-mem:

	cd mysql-test; \

	./mysql-test-run.pl && \

	./mysql-test-run.pl --ps-protocol

	./mysql-test-run --force --mem && \

	./mysql-test-run --ps-protocol --force --mem



test-force-pl:

	cd mysql-test; \

	./mysql-test-run.pl --force && \

	./mysql-test-run.pl --ps-protocol --force



test-force-pl-mem:

	cd mysql-test; \

	./mysql-test-run.pl --force --mem && \

	./mysql-test-run.pl --ps-protocol --force --mem



# Don't update the files from bitkeeper

%::SCCS/s.%

mysql-test/Makefile.am

+13 −7
Original line number Diff line number Diff line
@@ -34,18 +34,19 @@ benchdir_root= $(prefix) 
testdir =	        $(benchdir_root)/mysql-test

EXTRA_SCRIPTS = 	mysql-test-run.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)

EXTRA_DIST = 		$(EXTRA_SCRIPTS)

GENSCRIPTS =		mysql-test-run install_test_db mtr

GENSCRIPTS =		mysql-test-run-shell mysql-test-run install_test_db mtr

PRESCRIPTS =		mysql-test-run.pl

test_SCRIPTS = 		$(GENSCRIPTS) $(PRESCRIPTS)

test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem \

	std_data/server-cert.pem std_data/server-key.pem 

test_DATA = 		std_data/client-key.pem \

			std_data/client-cert.pem \

			std_data/cacert.pem \

			std_data/server-cert.pem \

			std_data/server-key.pem

CLEANFILES = 		$(GENSCRIPTS) $(test_DATA)



INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include -I..

EXTRA_PROGRAMS =	mysql_test_run_new

noinst_HEADERS =	my_manage.h

mysql_test_run_new_SOURCES=		mysql_test_run_new.c my_manage.c my_create_tables.c



noinst_HEADERS =	my_manage.h



dist-hook:

	mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \
@@ -117,6 +118,11 @@ mtr: 
	$(RM) -f mtr

	$(LN_S) mysql-test-run.pl mtr



# mysql-test-run - a shortcut for executing mysql-test-run.pl

mysql-test-run:

	$(RM) -f mysql-test-run

	$(LN_S) mysql-test-run.pl mysql-test-run



SUFFIXES = .sh



.sh: