Updated Branches: refs/heads/1.6.0-SNAPSHOT d497b8090 -> aff072d24
ACCUMULO-2220 supporting ACCUMULO_CONF_DIR in test/system/bench Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d8977c8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d8977c8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4d8977c8 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 4d8977c891017701d4ff2873439fc884b4a4ea57 Parents: 9bff89f Author: John Vines <vi...@apache.org> Authored: Thu Jan 30 18:27:31 2014 -0500 Committer: John Vines <vi...@apache.org> Committed: Thu Jan 30 18:27:31 2014 -0500 ---------------------------------------------------------------------- test/system/bench/lib/path.py | 7 +++++++ test/system/bench/lib/slaves.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d8977c8/test/system/bench/lib/path.py ---------------------------------------------------------------------- diff --git a/test/system/bench/lib/path.py b/test/system/bench/lib/path.py index 6dc4009..22b8309 100755 --- a/test/system/bench/lib/path.py +++ b/test/system/bench/lib/path.py @@ -18,10 +18,17 @@ import os HERE = os.path.dirname(__file__) ACCUMULO_HOME = os.getenv('ACCUMULO_HOME') +if not os.getenv('ACCUMULO_CONF_DIR'): + ACCUMULO_CONF_DIR = ACCUMULO_HOME+'/conf' +else: + ACCUMULO_CONF_DIR = os.getenv('ACCUMULO_CONF_DIR') def accumulo(*args): return os.path.join(ACCUMULO_HOME, *args) +def accumuloConf(*args): + return os.path.join(ACCUMULO_CONF_DIR, *args) + def accumuloJar(): import glob options = (glob.glob(accumulo('lib', 'accumulo*.jar')) + http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d8977c8/test/system/bench/lib/slaves.py ---------------------------------------------------------------------- diff --git a/test/system/bench/lib/slaves.py b/test/system/bench/lib/slaves.py index 8fb49f2..451d603 100755 --- a/test/system/bench/lib/slaves.py +++ b/test/system/bench/lib/slaves.py @@ -24,7 +24,7 @@ from lib.path import accumulo from lib.options import log def slaveNames(): - return [s.strip() for s in open(accumulo('conf', 'slaves'))] + return [s.strip() for s in open(accumuloConf('slaves'))] def runEach(commandMap): result = {}
