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 2018/03/23 15:09:01 UTC
[7/8] qpid-proton git commit: NO-JIRA: [ruby] Put external RUBYLIB at
end of path for tests
NO-JIRA: [ruby] Put external RUBYLIB at end of path for tests
Avoid picking up installed proton packages when testing.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/d37c32c1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/d37c32c1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/d37c32c1
Branch: refs/heads/master
Commit: d37c32c1d631a36574f07800e8f4443e91f1a9d5
Parents: 1f682a6
Author: Alan Conway <ac...@redhat.com>
Authored: Wed Mar 21 14:17:15 2018 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Fri Mar 23 09:39:39 2018 -0400
----------------------------------------------------------------------
proton-c/bindings/ruby/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d37c32c1/proton-c/bindings/ruby/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/ruby/CMakeLists.txt b/proton-c/bindings/ruby/CMakeLists.txt
index d8f9a44..f6f95f7 100644
--- a/proton-c/bindings/ruby/CMakeLists.txt
+++ b/proton-c/bindings/ruby/CMakeLists.txt
@@ -105,8 +105,8 @@ install(DIRECTORY lib/ DESTINATION ${RUBY_ARCHLIB_DIR} COMPONENT Ruby)
## Tests
-to_native_path("$ENV{RUBYLIB};${src}/lib;${src}/tests;${src}/spec;${bin};${c_lib_dir}" RUBYLIB)
-to_native_path("$ENV{PATH};${bin};${c_lib_dir}" PATH)
+to_native_path("${src}/lib;${src}/tests;${src}/spec;${bin};${c_lib_dir};$ENV{RUBYLIB}" RUBYLIB)
+to_native_path("${bin};${c_lib_dir};$ENV{PATH}" PATH)
execute_process(COMMAND ${RUBY_EXECUTABLE} -r minitest -e ""
RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org