Commit d23064a6 authored by unknown's avatar unknown
Browse files

Fix 'make distcheck' problems with new unittest code, and a small 

portability problem.


BitKeeper/etc/ignore:
  Use a wildcard to ignore all unittest *.t files
unittest/Makefile.am:
  Add unit to DISTCLEANFILES, and make sure to copy it from srcdir
unittest/examples/Makefile.am:
  Use srcdir to find mytap header
unittest/mysys/Makefile.am:
  Use srcdir to find mytap header
unittest/mytap/t/Makefile.am:
  Use builddir for finding mytap library
unittest/mytap/tap.c:
  Fix portability problem (declarations after code in C code)
parent c323e60c

.bzrignore

+4 −0
Original line number Diff line number Diff line
@@ -1760,3 +1760,7 @@ zlib/*.ds? 
zlib/*.vcproj

mysql-test/r/*.log

client/mysql_upgrade

unittest/examples/*.t

unittest/mysys/*.t

unittest/mytap/t/*.t

unittest/unit

unittest/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ SUBDIRS = mytap . mysys examples 


noinst_SCRIPTS = unit



DISTCLEANFILES = unit



unittests = mysys examples



.PHONY: all mytap mysys examples test
@@ -18,6 +20,6 @@ mysys: 
examples:

	cd examples && $(MAKE)



unit: unit.pl

unit: $(srcdir)/unit.pl

	cp $< $@

	chmod +x $@

unittest/examples/Makefile.am

+1 −1
Original line number Diff line number Diff line 
AM_CPPFLAGS        = -I$(srcdir) -I$(top_builddir)/include

AM_CPPFLAGS       += -I$(top_builddir)/unittest/mytap

AM_CPPFLAGS       += -I$(top_srcdir)/unittest/mytap



AM_LDFLAGS         = -L$(top_builddir)/unittest/mytap

unittest/mysys/Makefile.am

+1 −1
Original line number Diff line number Diff line 


AM_CPPFLAGS      = @ZLIB_INCLUDES@ -I$(top_builddir)/include 

AM_CPPFLAGS     += -I$(top_srcdir)/include -I$(top_builddir)/unittest/mytap

AM_CPPFLAGS     += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap



AM_LDFLAGS       = -L$(top_builddir)/unittest/mytap -L$(top_builddir)/mysys

AM_LDFLAGS      += -L$(top_builddir)/strings -L$(top_builddir)/dbug

unittest/mytap/t/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
AM_CPPFLAGS     = -I$(srcdir) -I$(top_builddir)/include

AM_CPPFLAGS    += -I$(srcdir)/..



AM_LDFLAGS      = -L$(srcdir)/..

AM_LDFLAGS      = -L$(top_builddir)/unittest/mytap



AM_CFLAGS       = -Wall -ansi -pedantic