You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2017/06/21 18:14:32 UTC
[2/5] qpid-proton git commit: NO-JIRA: allow travis & appveyor builds
to inject cmake/ctest args
NO-JIRA: allow travis & appveyor builds to inject cmake/ctest args
Setting env vars QPID_PROTON_CMAKE_ARGS and QPID_PROTON_CTEST_ARGS in
travis or appveyor settings will pass the args to cmake/ctest
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/bdf83cf5
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/bdf83cf5
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/bdf83cf5
Branch: refs/heads/master
Commit: bdf83cf51b441dab8252a36a753406fe001d9e4b
Parents: 332f587
Author: Alan Conway <ac...@redhat.com>
Authored: Wed Jun 21 12:12:32 2017 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Wed Jun 21 13:02:49 2017 -0400
----------------------------------------------------------------------
.travis.yml | 4 ++--
appveyor.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bdf83cf5/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index ffa09a6..a6ad025 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,7 +63,7 @@ before_script:
- export PATH=${HOME}/.local/bin:${PATH}
- mkdir Build
- cd Build
-- cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX
+- cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX ${QPID_PROTON_CMAKE_ARGS}
script:
-- cmake --build . --target install && ctest -V
+- cmake --build . --target install && ctest -V ${QPID_PROTON_CTEST_ARGS}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/bdf83cf5/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
index 8c61be0..0ee66ad 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,7 @@ cache:
before_build:
- mkdir BLD
- cd BLD
-- cmake -G "Visual Studio 12" -DBUILD_PERL=no ..
+- cmake -G "Visual Studio 12" -DBUILD_PERL=no %QPID_PROTON_CMAKE_ARGS% ..
- cd ..
build:
parallel: true
@@ -16,5 +16,5 @@ build:
test_script:
- cd BLD
- cmake --build . --target install --config %CONFIGURATION%
-- ctest -V -C %CONFIGURATION%
+- ctest -V -C %CONFIGURATION% %QPID_PROTON_CTEST_ARGS%
- cd ..
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org