diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-05-09 12:35:11 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-09 12:35:11 +0200 |
| commit | d3e2e1243bb0dae95ce35b0380dd4f8f476b254d (patch) | |
| tree | 8779ad6b2059f181770cc07e2437925d7d5d5d04 /unittest | |
| parent | 229dad1f9b12f8e9f64b6a605bdf8e31c339d018 (diff) | |
| parent | 124428a9e28e59f98b25d8ee07b57d264f63cbe4 (diff) | |
| download | mariadb-git-d3e2e1243bb0dae95ce35b0380dd4f8f476b254d.tar.gz | |
5.5 merge
Diffstat (limited to 'unittest')
| -rw-r--r-- | unittest/examples/simple-t.c | 1 | ||||
| -rw-r--r-- | unittest/mysys/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | unittest/sql/CMakeLists.txt | 29 | ||||
| -rw-r--r-- | unittest/sql/explain_filename-t.cc (renamed from unittest/mysys/explain_filename-t.cc) | 0 |
4 files changed, 30 insertions, 13 deletions
diff --git a/unittest/examples/simple-t.c b/unittest/examples/simple-t.c index f36d213d510..b3ead293289 100644 --- a/unittest/examples/simple-t.c +++ b/unittest/examples/simple-t.c @@ -1,4 +1,5 @@ /* Copyright (C) 2006 MySQL AB + Use is subject to license terms 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 diff --git a/unittest/mysys/CMakeLists.txt b/unittest/mysys/CMakeLists.txt index a6003b7c51d..8c09a466451 100644 --- a/unittest/mysys/CMakeLists.txt +++ b/unittest/mysys/CMakeLists.txt @@ -13,10 +13,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql - ${PCRE_INCLUDES} - ${CMAKE_SOURCE_DIR}/extra/yassl/include) - MY_ADD_TESTS(bitmap base64 my_vsnprintf my_atomic my_rdtsc lf my_malloc LINK_LIBRARIES mysys) @@ -27,12 +23,3 @@ IF(WIN32) MY_ADD_TESTS(my_delete LINK_LIBRARIES mysys) ENDIF() -IF(WIN32) - ADD_EXECUTABLE(explain_filename-t explain_filename-t.cc - ../../sql/nt_servc.cc) -ELSE() - ADD_EXECUTABLE(explain_filename-t explain_filename-t.cc) -ENDIF() - -TARGET_LINK_LIBRARIES(explain_filename-t sql mytap) -ADD_TEST(explain_filename explain_filename-t) diff --git a/unittest/sql/CMakeLists.txt b/unittest/sql/CMakeLists.txt index 36b14e9a08a..7cc05e8cea2 100644 --- a/unittest/sql/CMakeLists.txt +++ b/unittest/sql/CMakeLists.txt @@ -1,3 +1,32 @@ +# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. +# +# 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 MY_ADD_TESTS(my_apc LINK_LIBRARIES mysys EXT cc) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/unittest/mytap + ${CMAKE_SOURCE_DIR}/extra/yassl/include) + +IF(WIN32) + ADD_EXECUTABLE(explain_filename-t explain_filename-t.cc + ../../sql/nt_servc.cc) +ELSE() + ADD_EXECUTABLE(explain_filename-t explain_filename-t.cc) +ENDIF() + +TARGET_LINK_LIBRARIES(explain_filename-t sql mytap) +ADD_TEST(explain_filename explain_filename-t) + diff --git a/unittest/mysys/explain_filename-t.cc b/unittest/sql/explain_filename-t.cc index 69ce51c0446..69ce51c0446 100644 --- a/unittest/mysys/explain_filename-t.cc +++ b/unittest/sql/explain_filename-t.cc |