From: Kefu Chai Date: Wed, 21 Sep 2016 14:58:49 +0000 (+0800) Subject: test/cli/crushtool: fix the test of compile-decompile-recompile.t X-Git-Tag: v10.2.6~42^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F11410%2Fhead;p=ceph.git test/cli/crushtool: fix the test of compile-decompile-recompile.t should read the map from $TESTDIR, it's a regression introduced by b2c0a07 Fixes: http://tracker.ceph.com/issues/17306 Signed-off-by: Kefu Chai (cherry picked from commit 404043980d7882f320f48fbaed4b18f31bb15eb7) --- diff --git a/src/test/cli/crushtool/compile-decompile-recompile.t b/src/test/cli/crushtool/compile-decompile-recompile.t index bd1100ccda71c..7a1b61da8dfae 100644 --- a/src/test/cli/crushtool/compile-decompile-recompile.t +++ b/src/test/cli/crushtool/compile-decompile-recompile.t @@ -10,6 +10,6 @@ $ cmp need_tree_order.crush nto.conf $ cmp nto.compiled nto.recompiled - $ crushtool -c missing-bucket.crushmap.txt + $ crushtool -c "$TESTDIR/missing-bucket.crushmap.txt" in rule 'rule-bad' item 'root-404' not defined [1]