From 258459ed540b1eeb01524677ed08d4ed23b90938 Mon Sep 17 00:00:00 2001 From: Andrew Kryczka Date: Mon, 9 May 2016 14:38:50 -0700 Subject: [PATCH] Properly destroy ChrootEnv in env_test Summary: see title Test Plan: $ /mnt/gvfs/third-party2/valgrind/af85c56f424cd5edfc2c97588299b44ecdec96bb/3.10.0/gcc-4.9-glibc-2.20/e9936bf/bin/valgrind --error-exitcode=2 --leak-check=full ./env_test Reviewers: IslamAbdelRahman, sdong Reviewed By: sdong Subscribers: andrewkr, dhruba, leveldb Differential Revision: https://reviews.facebook.net/D57897 --- util/env_test.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/util/env_test.cc b/util/env_test.cc index df292ec30..8fe868c6e 100644 --- a/util/env_test.cc +++ b/util/env_test.cc @@ -1063,9 +1063,10 @@ TEST_P(EnvPosixTestWithParam, WritableFileWrapper) { INSTANTIATE_TEST_CASE_P(DefaultEnv, EnvPosixTestWithParam, ::testing::Values(Env::Default())); #if !defined(ROCKSDB_LITE) && !defined(OS_WIN) +static unique_ptr chroot_env(NewChrootEnv(Env::Default(), + test::TmpDir(Env::Default()))); INSTANTIATE_TEST_CASE_P(ChrootEnv, EnvPosixTestWithParam, - ::testing::Values(NewChrootEnv(Env::Default(), - "/tmp"))); + ::testing::Values(chroot_env.get())); #endif // !defined(ROCKSDB_LITE) && !defined(OS_WIN) } // namespace rocksdb