diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2012-07-19 12:57:36 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2012-07-19 12:57:36 +0200 |
| commit | 6aaf15798556b4d6880124ce858f9623e9de570c (patch) | |
| tree | 471fbcb1a5af0b2f7664afb9f4e19bd932eba2e9 | |
| parent | 913e3a8475f0cc69dcd149668291f973538e5046 (diff) | |
| download | mariadb-git-6aaf15798556b4d6880124ce858f9623e9de570c.tar.gz | |
Bug #14035452 - MODULARIZE MYSQL_CLIENT_TEST
Added new minimal client using same framework
Added internal test using it
Small changes to top level make/configure/cmake to have it built
| -rwxr-xr-x | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c30db2927d4..75927c40cae 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -310,3 +310,6 @@ IF(WITH_EMBEDDED_SERVER) ADD_SUBDIRECTORY(libmysqld/examples) ENDIF(WITH_EMBEDDED_SERVER) ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) +IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) + ADD_SUBDIRECTORY(internal) +ENDIF() diff --git a/Makefile.am b/Makefile.am index f4179f5cb47..2a89aea3c70 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @readline_topdir@ sql-common scripts \ @sql_union_dirs@ unittest \ - @sql_server@ @man_dirs@ tests \ + @sql_server@ @man_dirs@ tests internal \ netware @libmysqld_dirs@ \ mysql-test support-files sql-bench @tools_dirs@ \ win diff --git a/configure.in b/configure.in index 068328992e0..24e46259957 100644 --- a/configure.in +++ b/configure.in @@ -2849,6 +2849,10 @@ if test -d "$srcdir/cmd-line-utils/readline" ; then AC_CONFIG_FILES(cmd-line-utils/readline/Makefile) fi +if test -d "$srcdir/internal" ; then + AC_CONFIG_FILES(internal/Makefile) +fi + AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl unittest/Makefile unittest/mytap/Makefile unittest/mytap/t/Makefile dnl unittest/mysys/Makefile unittest/strings/Makefile dnl |