fix broken -DWITHOUT_SERVER build: move sql-dependent unit test from mysys/ to sql/
This commit is contained in:
parent
2221029f54
commit
5401d44708
@ -376,10 +376,13 @@ IF(WITH_UNIT_TESTS)
|
||||
ADD_SUBDIRECTORY(unittest/examples)
|
||||
ADD_SUBDIRECTORY(unittest/mysys)
|
||||
ADD_SUBDIRECTORY(unittest/my_decimal)
|
||||
IF(NOT WITHOUT_SERVER)
|
||||
ADD_SUBDIRECTORY(unittest/sql)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
IF(NOT WITHOUT_SERVER)
|
||||
SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
|
||||
SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
|
||||
# Add storage engines and plugins.
|
||||
CONFIGURE_PLUGINS()
|
||||
ENDIF()
|
||||
|
@ -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
|
||||
${CMAKE_SOURCE_DIR}/regex
|
||||
${CMAKE_SOURCE_DIR}/extra/yassl/include)
|
||||
|
||||
MY_ADD_TESTS(bitmap base64 my_vsnprintf my_atomic my_rdtsc lf my_malloc
|
||||
LINK_LIBRARIES mysys)
|
||||
|
||||
@ -24,12 +20,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)
|
||||
|
29
unittest/sql/CMakeLists.txt
Normal file
29
unittest/sql/CMakeLists.txt
Normal file
@ -0,0 +1,29 @@
|
||||
# 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
|
||||
|
||||
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)
|
Loading…
x
Reference in New Issue
Block a user