diff options
| author | Sage Weil <sage@inktank.com> | 2013-06-25 10:15:10 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-06-25 10:15:10 -0700 |
| commit | 12678a10938e1156cbce966a40344fc70abd66d2 (patch) | |
| tree | 3d9dfb3129e0f724c31c60702bd8536430f91742 | |
| parent | 37a20174fd22a79938ba9c93046e8830f4a3306f (diff) | |
| parent | 6e320a1bd338cd6287a697799dd562548c920f4d (diff) | |
| download | ceph-12678a10938e1156cbce966a40344fc70abd66d2.tar.gz | |
Merge pull request #379 from dachary/wip-5312
skip TEST(EXT4StoreTest, _detect_fs) if DISK or MOUNTPOINT are undefined
Reviewed-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/test/filestore/store_test.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/test/filestore/store_test.cc b/src/test/filestore/store_test.cc index 08f0b125e3d..abc5c5f1170 100644 --- a/src/test/filestore/store_test.cc +++ b/src/test/filestore/store_test.cc @@ -829,6 +829,10 @@ TEST_F(StoreTest, ColSplitTest3) { // support tests for qa/workunits/filestore/filestore.sh // TEST(EXT4StoreTest, _detect_fs) { + if (::getenv("DISK") == NULL || ::getenv("MOUNTPOINT") == NULL) { + cerr << "SKIP because DISK and MOUNTPOINT environment variables are not set. It is meant to run from qa/workunits/filestore/filestore.sh " << std::endl; + return; + } const string disk(::getenv("DISK")); EXPECT_LT((unsigned)0, disk.size()); const string mnt(::getenv("MOUNTPOINT")); |