Commit 519ebab0 authored by kent@mysql.com/kent-amd64.(none)'s avatar kent@mysql.com/kent-amd64.(none)
Browse files

SSL/Makefile.am mysql-test/Makefile.am: 

  Moved CERT files to where they are used, avoids conflict
  between two make files trying to install the same CERTs
SSL/*.pem, 
  Move: SSL/*.pem -> mysql-test/std_data/
parent db5ad35e

SSL/Makefile.am

+1 −3
Original line number Diff line number Diff line
@@ -15,9 +15,7 @@ 


## Process this file with automake to create Makefile.in



EXTRA_DIST=	NOTES cacert.pem client-cert.pem client-key.pem \

		run-client run-server server-cert.pem \

		server-key.pem

EXTRA_DIST= NOTES run-client run-server



# Don't update the files from bitkeeper

%::SCCS/s.%

mysql-test/Makefile.am

+1 −17
Original line number Diff line number Diff line
@@ -37,12 +37,7 @@ EXTRA_DIST = $(EXTRA_SCRIPTS) suite 
GENSCRIPTS =		mysql-test-run-shell mysql-test-run install_test_db mtr

PRESCRIPTS =		mysql-test-run.pl mysql-stress-test.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

CLEANFILES = 		$(GENSCRIPTS) $(test_DATA)

CLEANFILES = 		$(GENSCRIPTS)



INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include -I..
@@ -111,17 +106,6 @@ install-data-local: 
uninstall-local:

	@RM@ -f -r $(DESTDIR)$(testdir)



std_data/client-key.pem: $(top_srcdir)/SSL/$(@F)

	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

std_data/client-cert.pem: $(top_srcdir)/SSL/$(@F)

	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

std_data/cacert.pem: $(top_srcdir)/SSL/$(@F)

	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

std_data/server-cert.pem: $(top_srcdir)/SSL/$(@F)

	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data

std_data/server-key.pem: $(top_srcdir)/SSL/$(@F)

	@RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data



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

mtr:

	$(RM) -f mtr

SSL/cacert.pem→mysql-test/std_data/cacert.pem

+0 −0

File moved.

View file

SSL/client-cert.pem→mysql-test/std_data/client-cert.pem

+0 −0

File moved.

View file

SSL/client-key.pem→mysql-test/std_data/client-key.pem

+0 −0

File moved.

View file