]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
test: ceph-disk: run ceph-disk with cmake 9919/head
authorKefu Chai <kchai@redhat.com>
Fri, 24 Jun 2016 07:26:54 +0000 (15:26 +0800)
committerKefu Chai <kchai@redhat.com>
Mon, 27 Jun 2016 01:24:07 +0000 (09:24 +0800)
commit4af50e2e5f20e97c7ad463e07aaf8a0f48421579
tree55a7b6e20b65f2f79e054ac8e4e923a127213b7c
parent0fbe2d2c3e0366879e67e714a8182a05eb734ce1
test: ceph-disk: run ceph-disk with cmake

* CMakeLists.txt: do not run ceph-disk/run-tox.sh in its source
  directory anymore, "ceph" cli needs to run in the build directory.
* CMakeLists.txt, run-tox.sh:
  - pass $CEPH_BUILD_DIR down to tox.ini, so tox can set the working
    directory to $CEPH_BUILD_DIR to $CMAKE_BINARY_DIR, in which the
    "ceph" cli will be able to figure out where the pybind dso are
    located, and respawn itself with the necessary paths set accordingly.
  - pass $CEPH_BUILD_VIRTUALENV to tox, so ceph-helpers.sh is able to
    set the paths to ceph-disk and ceph-detect-init right.
* run-tox.sh: specify the full path of tox.ini, since we will call
  "tox" in the build directory.
* tox.ini:
  - move the non-flake8 related settings into [testenv:py27] section.
  - always use absolute path, as we will call "tox" in the build
    directory, instead where "tox.ini" lives.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/ceph-disk/run-tox.sh
src/ceph-disk/tox.ini
src/test/CMakeLists.txt