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/09/06 14:33:54 UTC
[1/2] qpid-interop-test git commit: QPIDIT-86, QPIDIT-84:
Improvements to installation; updated docs, QUICKSTART.md still WIP
Repository: qpid-interop-test
Updated Branches:
refs/heads/master 8bf7bfe4c -> 78938fc50
QPIDIT-86, QPIDIT-84: Improvements to installation; updated docs, QUICKSTART.md still WIP
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/466c14a2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/466c14a2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/466c14a2
Branch: refs/heads/master
Commit: 466c14a24e5be80c832cca33fa8d2494452efb74
Parents: f920bdf
Author: Kim van der Riet <kp...@apache.org>
Authored: Wed Sep 6 10:32:34 2017 -0400
Committer: Kim van der Riet <kp...@apache.org>
Committed: Wed Sep 6 10:32:34 2017 -0400
----------------------------------------------------------------------
CMakeLists.txt | 2 +
QUICKSTART.md | 109 ++++++++++++++++++++++++++++------------------------
README.md | 21 ++++++++++
config.sh.in | 22 +++++++++++
get-proj-ver | 17 +++++++-
5 files changed, 119 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/466c14a2/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3006b3b..69af53c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,3 +62,5 @@ install(CODE "execute_process(COMMAND chmod +x amqp_large_content_test.py
jms_hdrs_props_test.py
jms_messages_test.py
WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/python2.7/site-packages/qpid_interop_test/)")
+
+configure_file(config.sh.in config.sh)
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/466c14a2/QUICKSTART.md
----------------------------------------------------------------------
diff --git a/QUICKSTART.md b/QUICKSTART.md
index 8beea2b..8b33de1 100644
--- a/QUICKSTART.md
+++ b/QUICKSTART.md
@@ -1,34 +1,62 @@
+<!--
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+
+-->
+
# QUICKSTART GUIDE
-All these instructions depend on choosing an install mechanism. Two options exist:
-A: Install to default locations using root privileges (TODO: I have not tested this option!)
-B: Install to custom local location which don't require privileges (and is safer for testing). In each case,
- you should select the SAME prefix or install path for each component.
-The text below assumes you have chosen one of these. Your choice should be consistent for all components.
+You must build *and install* qpid-interop-test before you can run the tests.
+
+By default, qpid-interop-test will install to /usr/local, but you can set any
+non-priviedged directory as the install prefix, for example $HOME/install.
+
+The following pre-requisites must be installed *before* you build and install
+qpid-interop-test:
+
+ * Qpid Proton (includes C++ Proton API)
+ * Qpid Python
+ * Qpid JMS
+ * Maven
+ * JSON cpp
+
+The following are not required, but if installed and present, will be tested:
+
+ * Rhea (a Javascript client, also requires npm and nodejs)
+ * AMQP.Net Lite (requires mono)
+
+Pre-requisites can be installed using the standard system package manager (yum,
+dnf, apt-get etc.) OR built from source and installed *to the same prefix* as
+qpid-interop-test.
+
+For example, to install standard packages on Fedora 25:
+
+ sudo dnf install qpid-jms-client nodejs-rhea npm maven jsoncpp-devel
These are the install steps:
-1. Install and build packages required for qpid-interop-test
- * Qpid Proton (includes C++ Proton API)
- * Qpid Python
- * Qpid JMS
- * Rhea
+1. Install pre-requisites, from packages or source
2. Download and build qpid-interop-test
3. Install or download / build AMQP brokers to test against
4. Run the tests
-# 0. Prerequisites
-
-* Necessary packages for building and running qpid-interop-test and its dependencies:
-TODO: Complete this list
-
-* C++: json-cpp-devel and packages required for qpid-proton
-* Python: Nothing special, should be all installed standard on Lunux
-* Maven: mvn
-* Rhea: node npm
-
-# 1. Install and build packages required for qpid-interop-test
+# 1. How to build packages required for qpid-interop-test
## a. Get and build Qpid Proton
````
@@ -107,18 +135,7 @@ git clone https://git-wip-us.apache.org/repos/asf/qpid-interop-test.git
cd qpid-interop-test
mkdir build
cd build
-````
-
-### INSTALL OPTION A: (TODO: I have not tested this option!)
-````
-cmake ..
-make
-sudo make install
-````
-
-### INSTALL OPTION B:
-````
-cmake -DPROTON_INSTALL_DIR=/abs/path/to/local/install/dir -DCMAKE_INSTALL_PREFIX=/abs/path/to/local/install/dir ..
+cmake -DPROTON_INSTALL_DIR=<install-dir> -DCMAKE_INSTALL_PREFIX=<install-dir> ..
make install
````
@@ -170,29 +187,19 @@ TODO: Helpful hints on obtaining/building
# 4. Run the tests
-The following depend on which choice was made for installation above:
-
-## OPTION A (root install default locations):
+## a. Set the environment
-TODO: Still needs testing
-
-## OPTION B (local install)
-
-Set environment (use this in a script file)
+The config.sh script is in the build directory
````
-INSTALL_PATH=/abs/path/to/local/install/dir
-export QPID_INTEROP_TEST_HOME=/abs/path/to/local/qpid-interop-test
-export PYTHONPATH=${INSTALL_PATH}/lib64/proton/bindings/python:${INSTALL_PATH}/lib/python2.7/site-packages:${QPID_INTEROP_TEST_HOME}/src/python
-export LD_LIBRARY_PATH=${INSTALL_PATH}/lib64
+source build/config.sh
````
-Start the test broker
+## b. Start the test broker
-All of the tests are located in ${QPID_INTEROP_TEST_HOME}/src/python/qpid_interop_test, and can be directly called:
+## c. Run chosen tests
````
-./src/python/qpid_interop_test/amqp_types_test.py
-./src/python/qpid_interop_test/jms_messages_test.py
+python -m qpid_interop_test.amqp_types_test
+python -m qpid_interop_test.jms_messages_test
+...
````
-etc.
-
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/466c14a2/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 53b6dc3..e275e19 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,24 @@
+<!--
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+
+-->
+
# Qpid Client Interoperability Test Suite
This directory contains the Qpid Proton Client API test suite.
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/466c14a2/config.sh.in
----------------------------------------------------------------------
diff --git a/config.sh.in b/config.sh.in
new file mode 100644
index 0000000..15dfe48
--- /dev/null
+++ b/config.sh.in
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# Source this file to set up environment variables for the Qpid interop tests.
+
+export QPID_INTEROP_TEST_HOME=@CMAKE_SOURCE_DIR@
+export QIT_INSTALL_PREFIX=@CMAKE_INSTALL_PREFIX@
+export PYTHONPATH=@CMAKE_INSTALL_PREFIX@/lib64/proton/bindings/python:@CMAKE_INSTALL_PREFIX@/lib/python2.7/site-packages:$PYTHONPATH
+export LD_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib64:$LD_LIBRARY_PATH
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/466c14a2/get-proj-ver
----------------------------------------------------------------------
diff --git a/get-proj-ver b/get-proj-ver
index 4252081..478a7e1 100755
--- a/get-proj-ver
+++ b/get-proj-ver
@@ -1,5 +1,20 @@
#!/usr/bin/perl
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
use strict;
use warnings;
use XML::XPath;
@@ -7,4 +22,4 @@ use XML::XPath;
my $root = XML::XPath->new(filename => $ARGV[0]);
for my $node ($root->find('//project/version/text()')->get_nodelist) {
print($node->getData, "\n");
-}
\ 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
[2/2] qpid-interop-test git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/qpid-interop-test
Posted by kp...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/qpid-interop-test
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/78938fc5
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/78938fc5
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/78938fc5
Branch: refs/heads/master
Commit: 78938fc50d9656bf01f33c18251038119596f91d
Parents: 466c14a 8bf7bfe
Author: Kim van der Riet <kp...@apache.org>
Authored: Wed Sep 6 10:32:59 2017 -0400
Committer: Kim van der Riet <kp...@apache.org>
Committed: Wed Sep 6 10:32:59 2017 -0400
----------------------------------------------------------------------
shims/amqpnetlite/src/CMakeLists.txt | 92 ++-
.../amqp_large_content_test/Receiver/App.config | 24 +
.../Receiver/Properties/AssemblyInfo.cs | 57 ++
.../Receiver/Receiver.cs | 586 ++++++++++++++
.../Receiver/Receiver.csproj.in | 77 ++
.../Receiver/packages.config | 21 +
.../amqp_large_content_test/Sender/App.config | 24 +
.../Sender/Properties/AssemblyInfo.cs | 57 ++
.../amqp_large_content_test/Sender/Sender.cs | 782 +++++++++++++++++++
.../Sender/Sender.csproj.in | 76 ++
.../Sender/packages.config | 21 +
.../src/amqp_types_test/Receiver/Receiver.cs | 2 +-
.../amqp_large_content_test.py | 9 +
13 files changed, 1786 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org