Below is the list of changes that have just been committed into a local
5.1 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2341 06/04/13 13:01:57 jimw@stripped +6 -0
Fix 'make distcheck' problems with new unittest code, and a small
portability problem.
unittest/mytap/tap.c
1.4 06/04/13 13:01:54 jimw@stripped +3 -2
Fix portability problem (declarations after code in C code)
unittest/mytap/t/Makefile.am
1.4 06/04/13 13:01:54 jimw@stripped +1 -1
Use builddir for finding mytap library
unittest/mysys/Makefile.am
1.3 06/04/13 13:01:54 jimw@stripped +1 -1
Use srcdir to find mytap header
unittest/examples/Makefile.am
1.3 06/04/13 13:01:54 jimw@stripped +1 -1
Use srcdir to find mytap header
unittest/Makefile.am
1.4 06/04/13 13:01:54 jimw@stripped +3 -1
Add unit to DISTCLEANFILES, and make sure to copy it from srcdir
BitKeeper/etc/ignore
1.238 06/04/13 13:01:53 jimw@stripped +3 -7
Use a wildcard to ignore all unittest *.t files
BitKeeper/etc/ignore
1.237 06/04/13 12:49:18 jimw@stripped +8 -0
added unittest/examples/no_plan.t unittest/examples/simple.t unittest/examples/skip_all.t unittest/examples/skip.t unittest/examples/todo.t unittest/mysys/base64.t unittest/mysys/bitmap.t unittest/unit
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: jimw
# Host: rama.(none)
# Root: /home/jimw/my/mysql-5.1-kill-sql-bench
--- 1.3/unittest/mytap/t/Makefile.am 2006-04-06 08:18:05 -07:00
+++ 1.4/unittest/mytap/t/Makefile.am 2006-04-13 13:01:54 -07:00
@@ -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
--- 1.3/unittest/mytap/tap.c 2006-04-10 08:06:05 -07:00
+++ 1.4/unittest/mytap/tap.c 2006-04-13 13:01:54 -07:00
@@ -138,11 +138,12 @@
void
ok(int const pass, char const *fmt, ...)
{
+ va_list ap;
+ va_start(ap, fmt);
+
if (!pass && *g_test.todo == '\0')
++g_test.failed;
- va_list ap;
- va_start(ap, fmt);
emit_tap(pass, fmt, ap);
va_end(ap);
if (*g_test.todo != '\0')
--- 1.3/unittest/Makefile.am 2006-04-10 08:06:05 -07:00
+++ 1.4/unittest/Makefile.am 2006-04-13 13:01:54 -07:00
@@ -2,6 +2,8 @@
noinst_SCRIPTS = unit
+DISTCLEANFILES = unit
+
unittests = mysys examples
.PHONY: all mytap mysys examples test
@@ -18,6 +20,6 @@
examples:
cd examples && $(MAKE)
-unit: unit.pl
+unit: $(srcdir)/unit.pl
cp $< $@
chmod +x $@
--- 1.2/unittest/examples/Makefile.am 2006-04-06 08:18:05 -07:00
+++ 1.3/unittest/examples/Makefile.am 2006-04-13 13:01:54 -07:00
@@ -1,5 +1,5 @@
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
--- 1.2/unittest/mysys/Makefile.am 2006-04-06 08:18:05 -07:00
+++ 1.3/unittest/mysys/Makefile.am 2006-04-13 13:01:54 -07:00
@@ -1,6 +1,6 @@
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
--- 1.236/BitKeeper/etc/ignore 2006-04-11 18:53:52 -07:00
+++ 1.238/BitKeeper/etc/ignore 2006-04-13 13:01:53 -07:00
@@ -1760,3 +1760,7 @@
zlib/*.vcproj
mysql-test/r/*.log
client/mysql_upgrade
+unittest/examples/*.t
+unittest/mysys/*.t
+unittest/mytap/t/*.t
+unittest/unit
| Thread |
|---|
| • bk commit into 5.1 tree (jimw:1.2341) | Jim Winstead | 13 Apr |
