diff --git a/src/test/unittest/ut.c b/src/test/unittest/ut.c index 6b4355c8a76121a0d94470a03b1f4bada3a15f4d..37a15c6b4a21f05fd981e1e458492943193522e1 100644 --- a/src/test/unittest/ut.c +++ b/src/test/unittest/ut.c @@ -196,7 +196,7 @@ static int Force_quiet; /* set by UNITTEST_FORCE_QUIET env variable */ static char *Testname; /* set by UNITTEST_NAME env variable */ /* set by UNITTEST_CHECK_OPEN_FILES_IGNORE_BADBLOCKS env variable */ -static const char *Ignore_bb; +static int Ignore_bb; unsigned long Ut_pagesize; unsigned long long Ut_mmap_align; @@ -759,7 +759,11 @@ ut_start_common(const char *file, int line, const char *func, os_mutex_init(&Sigactions_lock); #else Ut_mmap_align = Ut_pagesize; - Ignore_bb = os_getenv("UNITTEST_CHECK_OPEN_FILES_IGNORE_BADBLOCKS"); + char *ignore_bb = + os_getenv("UNITTEST_CHECK_OPEN_FILES_IGNORE_BADBLOCKS"); + + if (ignore_bb && *ignore_bb) + Ignore_bb = 1; #endif if (os_getenv("UNITTEST_NO_SIGHANDLERS") == NULL) ut_register_sighandlers(); diff --git a/src/test/util_badblock/TEST10 b/src/test/util_badblock/TEST10 index fe7505ddf6e1cff79d59839a1822969508184251..10cde7d379224c61472ee01abe49d867e822683a 100755 --- a/src/test/util_badblock/TEST10 +++ b/src/test/util_badblock/TEST10 @@ -60,7 +60,8 @@ ENV="\ LD_LIBRARY_PATH=${LD_LIBRARY_PATH} \ UNITTEST_NUM=${UNITTEST_NUM} \ UNITTEST_NAME=${UNITTEST_NAME} \ -UNITTEST_LOG_LEVEL=${UNITTEST_LOG_LEVEL}" +UNITTEST_LOG_LEVEL=${UNITTEST_LOG_LEVEL} \ +UNITTEST_CHECK_OPEN_FILES_IGNORE_BADBLOCKS=${UNITTEST_CHECK_OPEN_FILES_IGNORE_BADBLOCKS}" expect_normal_exit sudo bash -c \"${ENV} \ ./util_badblock$EXESUFFIX $DIR/testfile1 l \"