Merge pull request #12048 from dzafman/wip-dz-memstore

tests: Minor clean-ups

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2016-11-18 17:47:14 +08:00 committed by GitHub
commit 2c16786f86
3 changed files with 10 additions and 4 deletions

View File

@ -9,7 +9,7 @@
#include <iostream>
using namespace std;
const string dir("store_test_temp_dir");
const string dir("rocksdb.test_temp_dir");
TEST(RocksDBOption, simple) {
rocksdb::Options options;

View File

@ -12,8 +12,14 @@ static void rm_r(const string& path) {
cout << "==> " << cmd << std::endl;
int r = ::system(cmd.c_str());
if (r) {
cerr << "failed with exit code " << r
<< ", continuing anyway" << std::endl;
if (r == -1) {
r = errno;
cerr << "system() failed to fork() " << cpp_strerror(r)
<< ", continuing anyway" << std::endl;
} else {
cerr << "failed with exit code " << r
<< ", continuing anyway" << std::endl;
}
}
}

View File

@ -1,6 +1,6 @@
#!/bin/sh -ex
rm -rf store_test_temp_dir
rm -rf memstore.test_temp_dir
ceph_test_objectstore --gtest_filter=\*/0
echo OK