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 | 4bf1d5b5dd4b18ee44ee65f1e444c011e7b6ddb4 (patch) | |
| tree | 84e51a69385d37ee82296290c8f45e10de76402e /storage/perfschema | |
| parent | 6e7a75bf5f4e5d6a009a320c0f79e3a469fbc521 (diff) | |
| download | mariadb-git-4bf1d5b5dd4b18ee44ee65f1e444c011e7b6ddb4.tar.gz | |
Post-merge fixes , define HAVE_RWLOCK_T on Solaris define
DISABLE_MYSQL_THREAD_H for strings
Also, enable unittests for perfschema
Diffstat (limited to 'storage/perfschema')
| -rw-r--r-- | storage/perfschema/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | storage/perfschema/unittest/CMakeLists.txt | 30 |
2 files changed, 20 insertions, 14 deletions
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() |