mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refs #5949 suppress valgrind on the first (crashing) execution of recovery_fileops_unit.tdb, for some reason raise(SIGKILL) hangs valgrind in that test

Browse source 
git-svn-id: file:///svn/toku/tokudb@52783 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Leif Walsh 2013-04-17 00:01:29 -04:00 • committed by Yoni Fogel
parent 89bf561b6d
commit fb69cae6cf
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/tests/recovery_fileops_unit.cc
View file

@ -124,7 +124,7 @@ do_args(int argc, char * const argv[]) {
}
char c;
while ((c = getopt(argc, argv, "vqhcrO:A:B:C:D:E:F:G:H:I:")) != -1) {
while ((c = getopt(argc, argv, "vqhcrO:A:B:C:D:E:F:G:H:I:X:")) != -1) {
switch(c) {
case 'v':
verbose++;
@ -174,6 +174,13 @@ do_args(int argc, char * const argv[]) {
usage();
choices[c - 'A'] = num;
break;
case 'X':
if (strcmp(optarg, "novalgrind") == 0) {
// provide a way for the shell script runner to pass an
// arg that suppresses valgrind on this child process
break;
}
// otherwise, fall through to an error
default:
usage();
break;

2
src/tests/run_recovery_fileops_unit.sh
View file

@ -8,7 +8,7 @@ errorfile=$1; shift
abortcode=$1; shift
set +e
$bin -c $@ 2> $errorfile
$bin -X novalgrind -c $@ 2> $errorfile
test $? -eq $abortcode || { cat $errorfile; echo Error: no crash in $errorfile; exit 1; }
set -e
grep -q 'HAPPY CRASH' $errorfile || { cat $errorfile; echo Error: incorrect crash in $errorfile; exit 1; }