You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2017/03/13 17:19:31 UTC
qpid-interop-test git commit: QPIDIT-56: Additional improvements for
handling local folder containing Rhea
Repository: qpid-interop-test
Updated Branches:
refs/heads/master 83fc550d9 -> 39bedc3a2
QPIDIT-56: Additional improvements for handling local folder containing Rhea
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/39bedc3a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/39bedc3a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/39bedc3a
Branch: refs/heads/master
Commit: 39bedc3a259aed721daa31e177ab424e3ce52be3
Parents: 83fc550
Author: Kim van der Riet <kp...@apache.org>
Authored: Mon Mar 13 13:17:21 2017 -0400
Committer: Kim van der Riet <kp...@apache.org>
Committed: Mon Mar 13 13:17:21 2017 -0400
----------------------------------------------------------------------
NOTICE | 5 ++++
STATUS | 48 ---------------------------------------
shims/rhea-js/CMakeLists.txt | 19 ++++++++++++++--
3 files changed, 22 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/39bedc3a/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..1384c22
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,5 @@
+Apache Qpid Interop Test
+Copyright [2015-2017] The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/39bedc3a/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
deleted file mode 100644
index 40df1b1..0000000
--- a/STATUS
+++ /dev/null
@@ -1,48 +0,0 @@
-1. AMQP type tests:
--------------------
-Main test launcher:
-Python program src/py/qpid-interop-test/types/simple_type_tests.py
-
-The launcher uses "shims", each of which is a simple pair of test programs
-which receive their instructions through the command-line. These are written
-using the target test client API. One program is a sender and is responsible
-for sending test messages, while the other is a receiver and is responsible
-for recieving the test messages and returning them to the launcher.
-
-1.1 Qpid-proton-python shim
----------------------------
-Status: Working.
- AMQP types:
- null - implemented
- boolean - implemented
- ubyte - implemented with Proton patch support for this type
- ushort - implemented with Proton patch support for this type
- uint - implemented with Proton patch support for this type
- ulong - implemented
- byte - implemented with Proton patch support for this type - fails in swig interface
- short - implemented with Proton patch support for this type
- int - implemented with Proton patch support for this type
- long - implemented
- float - implemented with Proton patch support for this type
- double - implemented
- decimal32 - implemented with Proton patch support for this type - fails in swig interface
- decimal64 - implemented with Proton patch support for this type - fails in swig interface
- decimal128 - implemented with Proton patch support for this type - not working, commented out
- char - implemented - not working, commented out
- timestamp - implemented
- uuid - implemented
- binary - implemented
- string - implemented
- symbol - implemented
- list - implemented
- map - implemented - test broken
- array - not yet implemented - TODO
-
-1.2 Qpid-JMS shim
------------------
-Status: In progress, AMQP string type works with Qpid-proton-python.
-
-
-2. AMQP functionality tests:
-----------------------------
-Not yet implemented
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/39bedc3a/shims/rhea-js/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/shims/rhea-js/CMakeLists.txt b/shims/rhea-js/CMakeLists.txt
index 6163ce2..d997215 100644
--- a/shims/rhea-js/CMakeLists.txt
+++ b/shims/rhea-js/CMakeLists.txt
@@ -22,10 +22,25 @@
project(qpid-interop-test-rhea-shims)
message(STATUS "Searching for Rhea shim build and run requirements...")
+set(RHEA_DIR "$ENV{HOME}/rhea" CACHE PATH "Path to local Rhea installation")
+find_file(RHEA package.json HINTS ${RHEA_DIR} NO_DEFAULT_PATH DOC "Rhea javascript package file")
+if (RHEA STREQUAL "RHEA-NOTFOUND")
+ message(STATUS "No local Rhea directory found, using upstream package.")
+ set(LOCAL_RHEA_PATH "")
+else()
+ message(STATUS "Local Rhea directory found at ${RHEA_DIR}")
+ set(LOCAL_RHEA_PATH ${RHEA_DIR})
+endif()
+
find_program(PROG_NODE node)
find_program(PROG_NPM npm)
if ((PROG_NODE STREQUAL "PROG_NODE-NOTFOUND") OR (PROG_NPM STREQUAL "PROG_NPM-NOTFOUND"))
- message(STATUS "Programs 'node' and/or 'npm' were not found. Rhea Javascript shim requires both of these.")
+ if (PROG_NODE STREQUAL "PROG_NODE-NOTFOUND")
+ message(STATUS "Program 'node' not found.")
+ endif()
+ if (PROG_NPM STREQUAL "PROG_NPM-NOTFOUND")
+ message(STATUS "Program 'npm' not found.")
+ endif()
# Set option that controls the build process
option(BUILD_RHEA "Build Rhea Javascript shim" OFF)
else ()
@@ -49,7 +64,7 @@ if (${BUILD_RHEA})
DESTINATION ${SHIM_INSTALL_PATH}/amqp_types_test/)
install(CODE "execute_process(COMMAND npm install node-uuid
WORKING_DIRECTORY ${SHIM_INSTALL_PATH})")
- install(CODE "execute_process(COMMAND npm link rhea
+ install(CODE "execute_process(COMMAND npm install rhea ${LOCAL_RHEA_PATH}
WORKING_DIRECTORY ${SHIM_INSTALL_PATH})")
endif()
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org