diff options
| author | Vladislav Vaintroub <wlad@sun.com> | 2010-01-14 18:42:28 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@sun.com> | 2010-01-14 18:42:28 +0000 |
| commit | cd45a44180766c93d7e58609a102e813c32735ba (patch) | |
| tree | 84e51a69385d37ee82296290c8f45e10de76402e | |
| parent | 6b6f0ca461f625267738ba646a8ff869fec93801 (diff) | |
| download | mariadb-git-cd45a44180766c93d7e58609a102e813c32735ba.tar.gz | |
Post-merge fixes , define HAVE_RWLOCK_T on Solaris define
DISABLE_MYSQL_THREAD_H for strings
Also, enable unittests for perfschema
| -rw-r--r-- | configure.cmake | 4 | ||||
| -rw-r--r-- | storage/perfschema/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | storage/perfschema/unittest/CMakeLists.txt | 30 | ||||
| -rwxr-xr-x | strings/CMakeLists.txt | 3 |
4 files changed, 27 insertions, 14 deletions
diff --git a/configure.cmake b/configure.cmake index 244fa1e0e9e..f9f302d9ee9 100644 --- a/configure.cmake +++ b/configure.cmake @@ -177,6 +177,10 @@ ELSEIF(CMAKE_SYSTEM MATCHES "HP-UX" AND CMAKE_SYSTEM MATCHES "11") ADD_DEFINITIONS(-DHPUX11) ENDIF() +IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") + ADD_DEFINITIONS(-DHAVE_RWLOCK_T) +ENDIF() + # Disable warnings in Visual Studio 8 and above IF(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7") #TODO: update the code and remove the disabled warnings diff --git a/storage/perfschema/CMakeLists.txt b/storage/perfschema/CMakeLists.txt index 985673561fe..508f37199fa 100644 --- a/storage/perfschema/CMakeLists.txt +++ b/storage/perfschema/CMakeLists.txt @@ -75,3 +75,7 @@ SET(PERFSCHEMA_SOURCES ha_perfschema.h ) MYSQL_ADD_PLUGIN(PERFSCHEMA ${PERFSCHEMA_SOURCES} STORAGE_ENGINE DEFAULT STATIC_ONLY) +IF(WITH_PERFSCHEMA_STORAGE_ENGINE AND WITH_UNIT_TESTS) + ENABLE_TESTING() + ADD_SUBDIRECTORY(unittest) +ENDIF() diff --git a/storage/perfschema/unittest/CMakeLists.txt b/storage/perfschema/unittest/CMakeLists.txt index 01f3fbb8c98..8a72b25b5b7 100644 --- a/storage/perfschema/unittest/CMakeLists.txt +++ b/storage/perfschema/unittest/CMakeLists.txt @@ -23,17 +23,19 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ADD_DEFINITIONS(-DMYSQL_SERVER) -LINK_LIBRARIES(perfschema mytap mysys dbug strings) - -ADD_EXECUTABLE(pfs_instr_class-t pfs_instr_class-t.cc) - -ADD_EXECUTABLE(pfs_instr_class-oom-t pfs_instr_class-oom-t.cc) - -ADD_EXECUTABLE(pfs_instr-t pfs_instr-t.cc) - -ADD_EXECUTABLE(pfs_instr-oom-t pfs_instr-oom-t.cc) - -ADD_EXECUTABLE(pfs_timer-t pfs_timer-t.cc) - -ADD_EXECUTABLE(pfs-t pfs-t.cc) - +MACRO (PFS_ADD_TEST name) + ADD_EXECUTABLE(${name}-t ${name}-t.cc) + TARGET_LINK_LIBRARIES(${name}-t mytap perfschema mysys) + ADD_TEST(${name} ${name}-t) +ENDMACRO() + +SET(tests + pfs_instr_class + pfs_instr_class-oom + pfs_instr + pfs_instr-oom + pfs +) +FOREACH(testname ${tests}) + PFS_ADD_TEST(${testname}) +ENDFOREACH() diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt index cdfaab9c17b..bb32f0d3f84 100755 --- a/strings/CMakeLists.txt +++ b/strings/CMakeLists.txt @@ -23,4 +23,7 @@ SET(STRINGS_SOURCES bchange.c bcmp.c bfill.c bmove512.c bmove_upp.c ctype-big5.c str2int.c str_alloc.c strcend.c strend.c strfill.c strmake.c strmov.c strnmov.c strtol.c strtoll.c strtoul.c strtoull.c strxmov.c strxnmov.c xml.c my_strchr.c strcont.c strinstr.c strnlen.c strappend.c) + +# Avoid dependencies on perschema data defined in mysys +ADD_DEFINITIONS(-DDISABLE_MYSQL_THREAD_H) ADD_CONVENIENCE_LIBRARY(strings ${STRINGS_SOURCES}) |