1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

makes mi_test_all.sh & ma_test_all.sh working (MDEV-285)

Browse Source
This commit is contained in:
unknown 2012-09-25 13:45:11 +03:00
parent b8ca6c2e68
commit 2f7d7c9f7f
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/maria/CMakeLists.txt
View File

@ -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)

13
storage/maria/ma_test_all.sh
View File

@ -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

2
storage/myisam/CMakeLists.txt
View File

@ -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)

2
storage/myisam/mi_test_all.sh
View File

@ -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