diff options
author | Ali Maredia <amaredia@redhat.com> | 2016-01-28 22:50:53 +0100 |
---|---|---|
committer | Ali Maredia <amaredia@redhat.com> | 2016-04-15 02:48:20 +0200 |
commit | ef8b113d070c69252b11f84e39f26b25bc9ac42f (patch) | |
tree | a12e0a70a3ddddce5f26491b2d6d6477153f786e /src/test/pybind | |
parent | cmake: moved tests into test/objectstore dir (diff) | |
download | ceph-ef8b113d070c69252b11f84e39f26b25bc9ac42f.tar.xz ceph-ef8b113d070c69252b11f84e39f26b25bc9ac42f.zip |
cmake: moved tests into test/pybind dir
Added a CMakeLists.txt into test/pybind. Added
CEPH_BIN in front of relative path in
test_ceph_argparse.py.
Signed-off-by: Ali Maredia <amaredia@redhat.com>
Diffstat (limited to 'src/test/pybind')
-rw-r--r-- | src/test/pybind/CMakeLists.txt | 2 | ||||
-rwxr-xr-x | src/test/pybind/test_ceph_argparse.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/test/pybind/CMakeLists.txt b/src/test/pybind/CMakeLists.txt new file mode 100644 index 00000000000..bc91bce305d --- /dev/null +++ b/src/test/pybind/CMakeLists.txt @@ -0,0 +1,2 @@ +add_ceph_test(test_ceph_daemon.py ${CMAKE_CURRENT_SOURCE_DIR}/test_ceph_daemon.py) +add_ceph_test(test_ceph_argparse.py ${CMAKE_CURRENT_SOURCE_DIR}/test_ceph_argparse.py) diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py index 4bf6c27f9bb..4c325f278e5 100755 --- a/src/test/pybind/test_ceph_argparse.py +++ b/src/test/pybind/test_ceph_argparse.py @@ -25,7 +25,8 @@ import re import json def get_command_descriptions(what): - return os.popen("./get_command_descriptions " + "--" + what).read() + CEPH_BIN = os.environ['CEPH_BIN'] + return os.popen(CEPH_BIN + "/get_command_descriptions " + "--" + what).read() def test_parse_json_funcsigs(): commands = get_command_descriptions("all") |