diff options
| author | Daniel Fischer <df@sun.com> | 2010-04-21 14:58:09 +0200 |
|---|---|---|
| committer | Daniel Fischer <df@sun.com> | 2010-04-21 14:58:09 +0200 |
| commit | b83e1c868622125ff59d405710cb6438c131a7f4 (patch) | |
| tree | 4fad82e285f056995b626f0a62b5fa0488294c19 /mysql-test/CMakeLists.txt | |
| parent | 718ee3e595d3c73517c1bc1df8d3bdfc2e22510b (diff) | |
| parent | 210d37e5c0aaa821783023b3f275c5e7992c515c (diff) | |
| download | mariadb-git-b83e1c868622125ff59d405710cb6438c131a7f4.tar.gz | |
Merge
Diffstat (limited to 'mysql-test/CMakeLists.txt')
| -rw-r--r-- | mysql-test/CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/CMakeLists.txt b/mysql-test/CMakeLists.txt index c00d5153d3e..1e6adced6a9 100644 --- a/mysql-test/CMakeLists.txt +++ b/mysql-test/CMakeLists.txt @@ -24,6 +24,7 @@ INSTALL( PATTERN "mtr.out*" EXCLUDE PATTERN ".cvsignore" EXCLUDE PATTERN "*.am" EXCLUDE + PATTERN "*.in" EXCLUDE ) @@ -46,7 +47,8 @@ IF(UNIX) WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mtr - ${CMAKE_CURRENT_BINARY_DIR}/mysql-test-run DESTINATION mysql-test) + ${CMAKE_CURRENT_BINARY_DIR}/mysql-test-run + DESTINATION ${INSTALL_MYSQLTESTDIR}) ENDIF() IF(CMAKE_GENERATOR MATCHES "Visual Studio") @@ -64,12 +66,6 @@ ELSE() ENDIF() -ADD_CUSTOM_TARGET(test-force - COMMAND ${SETCONFIG_COMMAND} - COMMAND ${SETOS_COMMAND} - COMMAND perl mysql-test-run.pl --force - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -) SET(EXP --experimental=collections/default.experimental) IF(WIN32) @@ -100,6 +96,11 @@ SET(TEST_BT_START COMMAND ${SET_ENV} MTR_BUILD_THREAD=auto ) +ADD_CUSTOM_TARGET(test-force + ${TEST_BT_START} + COMMAND ${MTR_FORCE} +) + ADD_CUSTOM_TARGET(test-bt ${TEST_BT_START} COMMAND ${MTR_FORCE} --comment=normal --timer --skip-ndbcluster --report-features ${EXP} @@ -124,4 +125,3 @@ ADD_CUSTOM_TARGET(test-bt-debug COMMAND ${MTR_FORCE} --comment=debug --timer --skip-ndbcluster --skip-rpl --report-features ${EXP} ) - |