diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-05-04 14:02:35 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-05-04 14:02:35 +0200 |
| commit | ab589043670145c95ff372021bab19464b6036e2 (patch) | |
| tree | 8e0f78653436b2c86704ff661d80b482b8b2b1f7 | |
| parent | e3ffaed1474971b656a3c77dc1d2605a5dbf02f6 (diff) | |
| download | mariadb-git-ab589043670145c95ff372021bab19464b6036e2.tar.gz | |
Fix FreeBSD test errors. Also link with libexecinfo on FreeBSD for stacktrace functionality.
| -rw-r--r-- | cmake/os/FreeBSD.cmake | 9 | ||||
| -rw-r--r-- | mysql-test/t/func_crypt.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/func_math.test | 1 | ||||
| -rw-r--r-- | mysys/CMakeLists.txt | 2 |
4 files changed, 13 insertions, 1 deletions
diff --git a/cmake/os/FreeBSD.cmake b/cmake/os/FreeBSD.cmake index 9bc7d944da2..27afe679f25 100644 --- a/cmake/os/FreeBSD.cmake +++ b/cmake/os/FreeBSD.cmake @@ -23,6 +23,15 @@ # The below was used for really old versions of FreeBSD, roughly: before 5.1.9 # ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH) +# Find libexecinfo (library that contains backtrace_symbols etc) +INCLUDE_DIRECTORIES(/usr/local/include) +SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include ) +SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib") +FIND_LIBRARY(EXECINFO NAMES execinfo) +IF(EXECINFO) + SET(LIBEXECINFO ${EXECINFO}) +ENDIF() + # Use atomic builtins IF(CMAKE_SIZEOF_VOID_P EQUAL 4 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "i386") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=i686") diff --git a/mysql-test/t/func_crypt.test b/mysql-test/t/func_crypt.test index 6dedeaa0fef..ca6e712f45c 100644 --- a/mysql-test/t/func_crypt.test +++ b/mysql-test/t/func_crypt.test @@ -23,7 +23,9 @@ select old_password(''); select password('gabbagabbahey'); select old_password('idkfa'); select length(password('1')); +--replace_result 60 13 select length(encrypt('test')); +--replace_result \$2a\$04\$aO....................ql.D6ROU4Byvysj72xrV1ZAkrMKS8I6 aaqPiZY5xR5l. select encrypt('test','aa'); select old_password(NULL); select password(NULL); diff --git a/mysql-test/t/func_math.test b/mysql-test/t/func_math.test index a1df990fa8e..b843cf8c364 100644 --- a/mysql-test/t/func_math.test +++ b/mysql-test/t/func_math.test @@ -17,6 +17,7 @@ explain extended select round(5.5),round(-5.5); select round(5.64,1),round(5.64,2),round(5.64,-1),round(5.64,-2); select abs(-10), sign(-5), sign(5), sign(0); explain extended select abs(-10), sign(-5), sign(5), sign(0); +--replace_result 2.0000000000000004 2 select log(exp(10)),exp(log(sqrt(10))*2),log(-1),log(NULL),log(1,1),log(3,9),log(-1,2),log(NULL,2); explain extended select log(exp(10)),exp(log(sqrt(10))*2),log(-1),log(NULL),log(1,1),log(3,9),log(-1,2),log(NULL,2); select ln(exp(10)),exp(ln(sqrt(10))*2),ln(-1),ln(0),ln(NULL); diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index 7397990eddb..832cd01e263 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -67,7 +67,7 @@ ENDIF() ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES}) TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} - ${LIBNSL} ${LIBM} ${LIBRT} ${LIBSOCKET}) + ${LIBNSL} ${LIBM} ${LIBRT} ${LIBSOCKET} ${LIBEXECINFO}) DTRACE_INSTRUMENT(mysys) IF(HAVE_BFD_H) |