Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake changes #10283

Merged
merged 10 commits into from
Jul 18, 2016
Merged

cmake changes #10283

merged 10 commits into from
Jul 18, 2016

Commits on Jul 15, 2016

  1. test: ceph-detect-init/run-tox.sh: run it from any path

    this follows the pattern in ceph-disk. this enables us to run
    ceph-detect-init/run-tox.sh from the ${CMAKE_BINARY_DIRECTORY}
    as well.
    
    Signed-off-by: Kefu Chai <kchai@redhat.com>
    tchaikov committed Jul 15, 2016
    Configuration menu
    Copy the full SHA
    3be6e1c View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2016

  1. cmake: add a "tests" target to build tests

    please note "make test" is used by cmake to run tests, so we cannot just
    repurpose it to *build* them.
    
    * AddCephTest.cmake: depends on "tests"
    * CMakeLists.txt: let "check" depend on "tests"
    * src/CMakeLists.txt: update the run-tox tests
    * run-make-check.sh: use "make tests" and "ctest" instead of "make check"
    * ceph-detect-init/CMakeLists.txt: let "tests" depend on
        "ceph-detect-init"
    * ceph-disk/CMakeLists.txt: let "tests" depend on "ceph-disk"
    
    Signed-off-by: Kefu Chai <kchai@redhat.com>
    tchaikov committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    ce5724e View commit details
    Browse the repository at this point in the history
  2. cmake: no need to depend run-tox-ceph-disk on test

    run-tox-ceph-disk and run-tox-ceph-detect-init are already added as
    test, so "ctest" and "make {test,check}" will run them without extra
    settings.
    
    Signed-off-by: Kefu Chai <kchai@redhat.com>
    tchaikov committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    5b14e28 View commit details
    Browse the repository at this point in the history
  3. cmake: label some tests with "Racing"

    two tests timesout for unknown reasons, so label them with
    "Racing" and "LongRunning" labels.
    
    Signed-off-by: Kefu Chai <kchai@redhat.com>
    tchaikov committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    3a21d00 View commit details
    Browse the repository at this point in the history
  4. run-make-check.sh: run tests in two steps

    this is a workaround of the timeout found in jenkins. currently three
    tests are found timeout, and they are labeld with "Racing" and
    "LongRunning". so, to workaround this issue, we run the tests in two
    phases:
    
    1. run the racing tests with -j1
    2. run the non-racing tests with -jN
    
    if we all all tests with -j1, the total test time is 2683.57 sec
    
    Signed-off-by: Kefu Chai <kchai@redhat.com>
    tchaikov committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    cd0dfc3 View commit details
    Browse the repository at this point in the history
  5. cmake: link libcommon against $CRYPTO_LIBS

    as ceph_crypt.cc is using the symbols in it, and libcommon contains
    ceph_crypt.cc.
    
    Signed-off-by: Kefu Chai <kchai@redhat.com>
    tchaikov committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    64a8bfb View commit details
    Browse the repository at this point in the history
  6. cmake: remove duplicated src from ceph_rgw_jsonparser

    they are included by rgw_a as well. and ceph_rgw_jsonparser is linked
    against rgw_a.
    
    Signed-off-by: Kefu Chai <kchai@redhat.com>
    tchaikov committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    941605d View commit details
    Browse the repository at this point in the history
  7. cmake: do not pass --disable-pip-version-check if not supported

    on older versions of pip, this option is not supported, and
    --disable-pip-version-check is implied with --no-index. so no need to
    use them when --no-index is passed to pip.
    
    this partially reverts 395f2c5
    
    Signed-off-by: Kefu Chai <kchai@redhat.com>
    tchaikov committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    4517661 View commit details
    Browse the repository at this point in the history
  8. cmake: restructure src/CMakeLists.txt in a more hierarchical way

    Signed-off-by: Kefu Chai <kchai@redhat.com>
    tchaikov committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    5a69597 View commit details
    Browse the repository at this point in the history
  9. cmake: only allow up to 1 hour for a ceph test

    quote from
    https://cmake.org/cmake/help/v3.0/prop_test/TIMEOUT.html?highlight=timeout
    
    > If it exceeds that the test process will be killed and ctest will move
    > to the next test.
    
    this helps us to identify test hang.
    
    Signed-off-by: Kefu Chai <kchai@redhat.com>
    tchaikov committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    c30c522 View commit details
    Browse the repository at this point in the history