qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kp...@apache.org
Subject qpid-interop-test git commit: QPIDIT-22: Fixed an error in the use of JAVA_HOME exposed by Jenkins
Date Tue, 19 Apr 2016 14:48:20 GMT
Repository: qpid-interop-test
Updated Branches:
  refs/heads/master a3753a434 -> 87e8eae63


QPIDIT-22: Fixed an error in the use of JAVA_HOME exposed by Jenkins


Project: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/commit/87e8eae6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/87e8eae6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/87e8eae6

Branch: refs/heads/master
Commit: 87e8eae63bd219a62c212d971554c881c689958b
Parents: a3753a4
Author: Kim van der Riet <kpvdr@apache.org>
Authored: Tue Apr 19 10:48:02 2016 -0400
Committer: Kim van der Riet <kpvdr@apache.org>
Committed: Tue Apr 19 10:48:02 2016 -0400

----------------------------------------------------------------------
 src/py/qpid-interop-test/jms/jms_message_tests.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/87e8eae6/src/py/qpid-interop-test/jms/jms_message_tests.py
----------------------------------------------------------------------
diff --git a/src/py/qpid-interop-test/jms/jms_message_tests.py b/src/py/qpid-interop-test/jms/jms_message_tests.py
index 201d08b..44480f9 100755
--- a/src/py/qpid-interop-test/jms/jms_message_tests.py
+++ b/src/py/qpid-interop-test/jms/jms_message_tests.py
@@ -342,8 +342,8 @@ class QpidJmsShim(Shim):
     LOGGER_IMPL_JAR = path.join(QPID_INTEROP_TEST_HOME, 'jars', 'slf4j-nop-1.5.6.jar')
     NETTY_JAR = path.join(MAVEN_REPO_PATH, 'io', 'netty', 'netty-all', '4.0.17.Final', 'netty-all-4.0.17.Final.jar')
 
-    JAVA_HOME = getenv('JAVA_HOME', '/usr/bin') # Default only works in Linux
-    JAVA_EXEC = path.join(JAVA_HOME, 'java')
+    JAVA_HOME = getenv('JAVA_HOME', '/usr/lib/jvm/java') # Default only works in Linux
+    JAVA_EXEC = path.join(JAVA_HOME, 'bin/java')
 
     def __init__(self, args):
         super(QpidJmsShim, self).__init__(args)


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


Mime
View raw message