bk commit into 5.1 tree (msvensson:1.2476)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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@stripped, 2007-03-26 11:50:27+02:00, msvensson@stripped +4 -0
  Port unittest/* to compile and run on windows

  CMakeLists.txt@stripped, 2007-03-26 11:50:25+02:00, msvensson@stripped +1 -0
    Add unittest directory to top level cmake file

  unittest/CMakeLists.txt@stripped, 2007-03-26 11:50:25+02:00, msvensson@stripped +37 -0
    Add cmake file in unittest to builds unit tests also on windows.

  unittest/CMakeLists.txt@stripped, 2007-03-26 11:50:25+02:00, msvensson@stripped +0 -0

  unittest/mytap/tap.c@stripped, 2007-03-26 11:50:25+02:00, msvensson@stripped +2 -2
    - Only install SIGBUS handler if SIGBUS is defined
    - Don't include my_config.h directly, it will be brougth
      in by my_global.h if necessary and in this case my_global.h
      is included by tap.h

  unittest/mytap/tap.h@stripped, 2007-03-26 11:50:25+02:00, msvensson@stripped +3 -3
    Update function declarations in header file to match those in the source file

# 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:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/bug26233/my51-bug26233

--- 1.10/unittest/mytap/tap.c	2006-12-23 20:33:31 +01:00
+++ 1.11/unittest/mytap/tap.c	2007-03-26 11:50:25 +02:00
@@ -19,8 +19,6 @@
 
 #include "tap.h"
 
-#include "my_config.h"
-
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -151,7 +149,9 @@ static signal_entry install_signal[]= {
   { SIGABRT, handle_core_signal },
   { SIGFPE,  handle_core_signal },
   { SIGSEGV, handle_core_signal },
+#ifdef SIGBUS
   { SIGBUS,  handle_core_signal }
+#endif
 #ifdef SIGXCPU
   , { SIGXCPU, handle_core_signal }
 #endif

--- 1.9/unittest/mytap/tap.h	2006-12-23 20:33:31 +01:00
+++ 1.10/unittest/mytap/tap.h	2007-03-26 11:50:25 +02:00
@@ -84,7 +84,7 @@ extern "C" {
    @param count The planned number of tests to run. 
 */
 
-void plan(int count);
+void plan(int const count);
 
 
 /**
@@ -103,7 +103,7 @@ void plan(int count);
                which case nothing is printed.
 */
 
-void ok(int pass, char const *fmt, ...)
+void ok(int const pass, char const *fmt, ...)
   __attribute__((format(printf,2,3)));
 
 
@@ -135,7 +135,7 @@ void ok(int pass, char const *fmt, ...)
    @param reason     A reason for skipping the tests
  */
 
-void skip(int how_many, char const *reason, ...)
+void skip(int how_many, char const * const reason, ...)
     __attribute__((format(printf,2,3)));
 
 
--- New file ---
+++ unittest/CMakeLists.txt	07/03/26 11:50:25
# Copyright (C) 2006 MySQL AB
# 
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
# 
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
# 
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA


SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")

INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
                    ${CMAKE_SOURCE_DIR}/unittest/mytap)

ADD_LIBRARY(mytap mytap/tap.c)

ADD_EXECUTABLE(base64-t mysys/base64-t.c)
TARGET_LINK_LIBRARIES(base64-t mytap dbug mysys strings)

ADD_EXECUTABLE(bitmap-t mysys/bitmap-t.c)
TARGET_LINK_LIBRARIES(bitmap-t mytap dbug mysys strings)

ADD_EXECUTABLE(my_atomic-t mysys/my_atomic-t.c)
TARGET_LINK_LIBRARIES(my_atomic-t mytap dbug mysys strings)

ADD_EXECUTABLE(mf_tempfile-t mysys/mf_tempfile-t.cc)
TARGET_LINK_LIBRARIES(mf_tempfile-t mytap dbug mysys strings wsock32)




--- 1.25/CMakeLists.txt	2006-12-31 01:37:21 +01:00
+++ 1.26/CMakeLists.txt	2007-03-26 11:50:25 +02:00
@@ -139,6 +139,7 @@ ADD_SUBDIRECTORY(storage/heap)
 ADD_SUBDIRECTORY(storage/myisam)
 ADD_SUBDIRECTORY(storage/myisammrg)
 ADD_SUBDIRECTORY(client)
+ADD_SUBDIRECTORY(unittest)
 IF(WITH_ARCHIVE_STORAGE_ENGINE)
   ADD_SUBDIRECTORY(storage/archive)
 ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)