summaryrefslogtreecommitdiff
path: root/src/test/rados-api
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-09-12 10:56:37 -0700
committerSage Weil <sage@newdream.net>2011-09-12 10:56:37 -0700
commit923c60c58811722ba936721d6a67a0e09ffcf0ce (patch)
tree2dc5d6ffaaf2749e14bf163ca7356ecd42e6be7d /src/test/rados-api
parent5cb7b3729bfe139cbf15e9e8508a6661483964fe (diff)
downloadceph-923c60c58811722ba936721d6a67a0e09ffcf0ce.tar.gz
librados: add conf_parse_env()
With optional env var name, defaults to CEPH_ARGS. Parse it for librados and librbd api gtests. Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'src/test/rados-api')
-rw-r--r--src/test/rados-api/test.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/rados-api/test.cc b/src/test/rados-api/test.cc
index ba9c5f2082e..dd0c4f0f1f4 100644
--- a/src/test/rados-api/test.cc
+++ b/src/test/rados-api/test.cc
@@ -38,6 +38,7 @@ std::string create_one_pool(const std::string &pool_name, rados_t *cluster)
oss << "rados_conf_read_file failed with error " << ret;
return oss.str();
}
+ rados_conf_parse_env(*cluster, NULL);
ret = rados_connect(*cluster);
if (ret) {
rados_shutdown(*cluster);
@@ -71,6 +72,7 @@ std::string create_one_pool_pp(const std::string &pool_name, Rados &cluster)
oss << "cluster.conf_read_file failed with error " << ret;
return oss.str();
}
+ cluster.conf_parse_env(NULL);
ret = cluster.connect();
if (ret) {
cluster.shutdown();