You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2013/06/18 20:47:31 UTC
svn commit: r1494242 - in /qpid/proton/trunk/proton-c: CMakeLists.txt env.py
Author: rhs
Date: Tue Jun 18 18:47:31 2013
New Revision: 1494242
URL: http://svn.apache.org/r1494242
Log:
fixed env.py to not swallow error codes
Modified:
qpid/proton/trunk/proton-c/CMakeLists.txt
qpid/proton/trunk/proton-c/env.py
Modified: qpid/proton/trunk/proton-c/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/CMakeLists.txt?rev=1494242&r1=1494241&r2=1494242&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Tue Jun 18 18:47:31 2013
@@ -398,13 +398,12 @@ if (ruby_exe)
set (rb_src "${CMAKE_CURRENT_SOURCE_DIR}/bindings/ruby")
set (rb_bin "${CMAKE_CURRENT_BINARY_DIR}/bindings/ruby")
set (rb_bld "${CMAKE_CURRENT_BINARY_DIR}${bld_suffix}")
- set_path (rb "$ENV{PATH}:${rb_bin}:${rb_bld}")
- set_path (rb "$ENV{RUBYLIB}:${rb_root}:${rb_src}:${rb_bin}:${rb_bld}")
+ set (rb_path "$ENV{PATH}:${rb_bin}:${rb_bld}")
+ set (rb_rubylib "$ENV{RUBYLIB}:${rb_root}:${rb_src}:${rb_bin}:${rb_bld}")
# ruby unit tests: tests/ruby/proton-test
add_test (ruby-unit-test python ${env_py} "PATH=${rb_path}" "RUBYLIB=${rb_rubylib}"
"${rb_root}/proton-test")
- set_tests_properties(ruby-unit-test PROPERTIES FAIL_REGULAR_EXPRESSION "Error;Failure")
# ruby spec tests
find_program(rspec_exe rspec)
Modified: qpid/proton/trunk/proton-c/env.py
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/env.py?rev=1494242&r1=1494241&r2=1494242&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/env.py (original)
+++ qpid/proton/trunk/proton-c/env.py Tue Jun 18 18:47:31 2013
@@ -59,8 +59,7 @@ def main(argv=None):
raise Exception("Error: syntax error in command arguments")
p = subprocess.Popen(args, env=new_env)
- p.wait()
- return 0
+ return p.wait()
if __name__ == "__main__":
sys.exit(main())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org