You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2015/02/17 18:16:56 UTC
qpid-proton git commit: Revert "NO-JIRA: Enable valgrind testing for
python tests."
Repository: qpid-proton
Updated Branches:
refs/heads/master de9f21f92 -> 6880a07b0
Revert "NO-JIRA: Enable valgrind testing for python tests."
This change broke testing on windows due to removing the ${PYTHON_EXE}
from many test lines
This reverts commit de9f21f92756ba7791358f32f35547a7cdb20432.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/6880a07b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/6880a07b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/6880a07b
Branch: refs/heads/master
Commit: 6880a07b05f3b5d2d92e6af59f1a8a3aa5ac1f17
Parents: de9f21f
Author: Andrew Stitcher <as...@apache.org>
Authored: Tue Feb 17 12:15:09 2015 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Tue Feb 17 12:16:02 2015 -0500
----------------------------------------------------------------------
proton-c/CMakeLists.txt | 19 ++++++++++---------
proton-c/env.py | 5 -----
2 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6880a07b/proton-c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
index 4073f98..181b254 100644
--- a/proton-c/CMakeLists.txt
+++ b/proton-c/CMakeLists.txt
@@ -73,17 +73,15 @@ include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/include")
# if/when this executable gets sorted out remove
include_directories ("${CMAKE_SOURCE_DIR}/examples/include")
-set (env_py ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/env.py)
-
add_custom_command (
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/encodings.h
- COMMAND ${env_py} PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/src/codec/encodings.h.py > ${CMAKE_CURRENT_BINARY_DIR}/src/encodings.h
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/env.py PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/src/codec/encodings.h.py > ${CMAKE_CURRENT_BINARY_DIR}/src/encodings.h
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/codec/encodings.h.py
)
add_custom_command (
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/protocol.h
- COMMAND ${env_py} PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/src/protocol.h.py > ${CMAKE_CURRENT_BINARY_DIR}/src/protocol.h
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/env.py PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/src/protocol.h.py > ${CMAKE_CURRENT_BINARY_DIR}/src/protocol.h
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/protocol.h.py
)
@@ -473,6 +471,9 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows)
endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
+
+set (env_py "${CMAKE_CURRENT_SOURCE_DIR}/env.py" )
+
find_program(VALGRIND_EXE valgrind DOC "Location of the valgrind program")
option(ENABLE_VALGRIND "Use valgrind to detect run-time problems" ON)
if (ENABLE_VALGRIND)
@@ -502,7 +503,7 @@ if (BUILD_PYTHON)
if (CMAKE_SYSTEM_NAME STREQUAL Windows)
set_path (py_pythonpath "${py_bin}${bld_suffix}:${py_pythonpath}")
endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
- add_test (python-test ${env_py}
+ add_test (python-test ${PYTHON_EXECUTABLE} ${env_py}
"PATH=${py_path}" "PYTHONPATH=${py_pythonpath}" ${VALGRIND_ENV}
${PYTHON_EXECUTABLE} "${py_root}/proton-test")
set_tests_properties(python-test PROPERTIES PASS_REGULAR_EXPRESSION "Totals: .* 0 failed")
@@ -521,7 +522,7 @@ if (RUBY_EXE)
# ruby unit tests: tests/ruby/proton-test
# only enable the tests if the Ruby gem dependencies were found
if (DEFAULT_RUBY_TESTING)
- add_test (ruby-unit-test ${env_py} "PATH=${rb_path}" "RUBYLIB=${rb_rubylib}"
+ add_test (ruby-unit-test ${PYTHON_EXECUTABLE} ${env_py} "PATH=${rb_path}" "RUBYLIB=${rb_rubylib}"
"${rb_root}/proton-test")
# ruby spec tests
@@ -529,7 +530,7 @@ if (RUBY_EXE)
if (RSPEC_EXE)
add_test (NAME ruby-spec-test
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bindings/ruby
- COMMAND ${env_py} "PATH=${rb_path}" "RUBYLIB=${rb_rubylib}"
+ COMMAND ${PYTHON_EXECUTABLE} ${env_py} "PATH=${rb_path}" "RUBYLIB=${rb_rubylib}"
${RSPEC_EXE})
else(RSPEC_EXE)
@@ -545,8 +546,8 @@ endif (RUBY_EXE)
mark_as_advanced (RUBY_EXE RSPEC_EXE)
if (BUILD_JAVASCRIPT)
- add_test (javascript-codec ${env_py} node ${pn_test_root}/javascript/codec.js)
- add_test (javascript-message ${env_py} node ${pn_test_root}/javascript/message.js)
+ add_test (javascript-codec ${PYTHON_EXECUTABLE} ${env_py} node ${pn_test_root}/javascript/codec.js)
+ add_test (javascript-message ${PYTHON_EXECUTABLE} ${env_py} node ${pn_test_root}/javascript/message.js)
endif (BUILD_JAVASCRIPT)
# build examples to make sure they still work
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6880a07b/proton-c/env.py
----------------------------------------------------------------------
diff --git a/proton-c/env.py b/proton-c/env.py
index 04fa8bb..14df6d1 100644
--- a/proton-c/env.py
+++ b/proton-c/env.py
@@ -58,11 +58,6 @@ def main(argv=None):
if len(args) == 0 or len(args[0]) == 0:
raise Exception("Error: syntax error in command arguments")
- if new_env.get("VALGRIND") and new_env.get("VALGRIND_ALL"):
- # Python generates a lot of possibly-lost errors that are not errors, don't show them.
- args = [new_env.get("VALGRIND"), "--show-reachable=no", "--show-possibly-lost=no",
- "--error-exitcode=42"] + args
-
p = subprocess.Popen(args, env=new_env)
return p.wait()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org