qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject qpid-proton git commit: NO-JIRA: Revert use of cmake ENVIRONMENT test property
Date Wed, 19 Sep 2018 17:11:22 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/master 96972871c -> 5cd006f96


NO-JIRA: Revert use of cmake ENVIRONMENT test property

Does not work on some older versions of CMake, even though the 2.8.12
documentation says it should.


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/5cd006f9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/5cd006f9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/5cd006f9

Branch: refs/heads/master
Commit: 5cd006f96c51f9079fc4a25ca60740c4008a9e95
Parents: 9697287
Author: Alan Conway <aconway@redhat.com>
Authored: Wed Sep 19 12:17:14 2018 -0400
Committer: Alan Conway <aconway@redhat.com>
Committed: Wed Sep 19 12:17:40 2018 -0400

----------------------------------------------------------------------
 cpp/examples/CMakeLists.txt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/5cd006f9/cpp/examples/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/cpp/examples/CMakeLists.txt b/cpp/examples/CMakeLists.txt
index 35ad01c..226f6b2 100644
--- a/cpp/examples/CMakeLists.txt
+++ b/cpp/examples/CMakeLists.txt
@@ -121,14 +121,12 @@ if (PYTHON_EXECUTABLE)
   add_test(
     NAME cpp-example-container
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMAND ${PYTHON_EXECUTABLE} testme -v ContainerExampleTest)
-  set_tests_properties(cpp-example-container PROPERTIES ENVIRONMENT "${test_env}")
+    COMMAND ${PN_ENV_SCRIPT} -- ${test_env} ${PYTHON_EXECUTABLE} testme -v ContainerExampleTest)
 
   if (NOT SSL_IMPL STREQUAL none)
     add_test(
       NAME cpp-example-container-ssl
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-      COMMAND ${PYTHON_EXECUTABLE}  testme -v ContainerExampleSSLTest)
-    set_tests_properties(cpp-example-container-ssl PROPERTIES ENVIRONMENT "${test_env}")
+      COMMAND ${PN_ENV_SCRIPT} -- ${test_env} ${PYTHON_EXECUTABLE}  testme -v ContainerExampleSSLTest)
   endif()
 endif()


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message