Commit 24caba3a authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-5.1-new 

into  mysql.com:/home/bk/merge-mysql-5.1-wl3206


Makefile.am:
  Merge with mysql-5.1-new
configure.in:
  Merge with mysql-5.1-new
parents dfaea5c8 24f672c0

Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ 
			@mysql_se_plugins@ \

			netware @libmysqld_dirs@ \

			@bench_dirs@ support-files @tools_dirs@ \

			plugin win

			plugin unittest win



DIST_SUBDIRS =		. include @docs_dirs@ zlib \

			@readline_topdir@ sql-common \
@@ -39,7 +39,7 @@ DIST_SUBDIRS = . include @docs_dirs@ zlib \ 
			@man_dirs@ tests \

			BUILD netware @libmysqld_dirs@\

			@bench_dirs@ support-files server-tools \

			plugin win

			plugin unittest win



# Run these targets before any others, also make part of clean target,

# to make sure we create new links after a clean.

configure.in

+3 −0
Original line number Diff line number Diff line
@@ -2586,6 +2586,9 @@ AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS) 


# Output results

AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl

 unittest/Makefile dnl

 unittest/mytap/Makefile unittest/mytap/t/Makefile dnl

 unittest/mysys/Makefile unittest/examples/Makefile dnl

 strings/Makefile regex/Makefile storage/Makefile storage/heap/Makefile dnl

 storage/myisam/Makefile storage/myisammrg/Makefile dnl

 man/Makefile BUILD/Makefile vio/Makefile dnl

include/my_bitmap.h

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ extern void bitmap_set_prefix(MY_BITMAP *map, uint prefix_size); 
extern void bitmap_intersect(MY_BITMAP *map, const MY_BITMAP *map2);

extern void bitmap_subtract(MY_BITMAP *map, const MY_BITMAP *map2);

extern void bitmap_union(MY_BITMAP *map, const MY_BITMAP *map2);

extern void bitmap_xor(MY_BITMAP *map, const MY_BITMAP *map2);

extern void bitmap_invert(MY_BITMAP *map);



extern uint bitmap_lock_set_next(MY_BITMAP *map);

extern void bitmap_lock_clear_bit(MY_BITMAP *map, uint bitmap_bit);

unittest/Makefile.am

0 → 100644
+23 −0
Original line number Diff line number Diff line 
SUBDIRS      = mytap . mysys examples



noinst_SCRIPTS = unit



unittests = mysys examples



.PHONY: all mytap mysys examples test



test: unit all

	@./unit run $(unittests)



mytap:

	cd mytap && $(MAKE)



mysys:

	cd mysys && $(MAKE)



examples:

	cd examples && $(MAKE)



unit: unit.pl

	cp $< $@

	chmod +x $@

unittest/README.txt

0 → 100644
+36 −0
Original line number Diff line number Diff line 


Unit tests directory structure

------------------------------



This is the current structure of the unit tests.  More directories

will be added over time.



mytap                 Source for the MyTAP library

mysys                 Tests for mysys components

  bitmap.t.c          Unit test for MY_BITMAP

  base64.t.c          Unit test for base64 encoding functions

examples              Example unit tests

  simple.t.c          Example of a standard TAP unit test

  skip.t.c            Example where some test points are skipped

  skip_all.t.c        Example of a test where the entire test is skipped

  todo.t.c            Example where test contain test points that are TODO

  no_plan.t.c         Example of a test with no plan (avoid this)





Executing unit tests

--------------------



To make and execute all unit tests in the directory:



   make test





Adding unit tests

-----------------



Add a file with a name of the format "foo.t.c" to the appropriate

directory and add the following to the Makefile.am in that directory

(where ... denotes stuff already there):



  noinst_PROGRAMS = ... foo.t

  foo_t_c_SOURCES = foo.t.c