diff options
| author | unknown <sanja@montyprogram.com> | 2012-09-25 13:45:11 +0300 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2012-09-25 13:45:11 +0300 |
| commit | 2f7d7c9f7f7b8da68de4bed21f167e316c600a0e (patch) | |
| tree | 2b23c98af38da9bd1fb9bfa620cbba34216e79b1 /storage | |
| parent | b8ca6c2e68a7875ec585af516bbc6331d2c2b940 (diff) | |
| download | mariadb-git-2f7d7c9f7f7b8da68de4bed21f167e316c600a0e.tar.gz | |
makes mi_test_all.sh & ma_test_all.sh working (MDEV-285)
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/maria/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | storage/maria/ma_test_all.sh | 13 | ||||
| -rw-r--r-- | storage/myisam/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | storage/myisam/mi_test_all.sh | 2 |
4 files changed, 14 insertions, 5 deletions
diff --git a/storage/maria/CMakeLists.txt b/storage/maria/CMakeLists.txt index 2817e11681c..9ca198873d1 100644 --- a/storage/maria/CMakeLists.txt +++ b/storage/maria/CMakeLists.txt @@ -68,7 +68,7 @@ SET_TARGET_PROPERTIES(aria_dump_log PROPERTIES COMPILE_FLAGS "-DMARIA_DUMP_LOG") MYSQL_ADD_EXECUTABLE(aria_pack maria_pack.c COMPONENT Server) TARGET_LINK_LIBRARIES(aria_pack aria) -IF(WITH_UNIT_TESTS AND FALSE) +IF(WITH_UNIT_TESTS) ADD_EXECUTABLE(ma_test1 ma_test1.c) TARGET_LINK_LIBRARIES(ma_test1 aria) diff --git a/storage/maria/ma_test_all.sh b/storage/maria/ma_test_all.sh index 041fbf3abe6..4e9be4a5beb 100755 --- a/storage/maria/ma_test_all.sh +++ b/storage/maria/ma_test_all.sh @@ -7,13 +7,22 @@ # # +PRG='unittest/ma_test_all-t' +UTST='../../unittest/unit.pl' + +if [ ! -x $PRG ] ; then + DIR=`dirname $0` + PRG="$DIR/unittest/ma_test_all-t" + UTST="$DIR/../../unittest/unit.pl" +fi + if test -n "$1"; then # unit.pl can't pass options to ma_test_all-t, so if anything # was passed as an argument, assume the purpose was to pass # them to ma_test_all-t and call it directly - unittest/ma_test_all-t $@ + $PRG $@ else - perl ../../unittest/unit.pl run unittest/ma_test_all-t + perl $UTST run $PRG fi diff --git a/storage/myisam/CMakeLists.txt b/storage/myisam/CMakeLists.txt index 97c1bc78d95..f58c942b4d7 100644 --- a/storage/myisam/CMakeLists.txt +++ b/storage/myisam/CMakeLists.txt @@ -46,7 +46,7 @@ TARGET_LINK_LIBRARIES(myisamlog myisam) MYSQL_ADD_EXECUTABLE(myisampack myisampack.c COMPONENT Server) TARGET_LINK_LIBRARIES(myisampack myisam) -IF(WITH_UNIT_TESTS AND FALSE) +IF(WITH_UNIT_TESTS) ADD_EXECUTABLE(mi_test1 mi_test1.c) TARGET_LINK_LIBRARIES(mi_test1 myisam) diff --git a/storage/myisam/mi_test_all.sh b/storage/myisam/mi_test_all.sh index 641f1cc0a35..c9c89a9ecac 100755 --- a/storage/myisam/mi_test_all.sh +++ b/storage/myisam/mi_test_all.sh @@ -99,7 +99,7 @@ if test -f mi_test1$MACH ; then suffix=$MACH ; else suffix=""; fi # check of myisampack / myisamchk ./myisampack$suffix --force -s test1 # Ignore error for index file -./myisamchk$suffix -es test1 2>&1 >& /dev/null +./myisamchk$suffix -es test1 2>&1 > /dev/null ./myisamchk$suffix -rqs test1 ./myisamchk$suffix -es test1 ./myisamchk$suffix -rs test1 |