qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kp...@apache.org
Subject [1/2] qpid-interop-test git commit: QPIDIT-125: Added Apache license text to each .gitignore file, updated doc files
Date Fri, 29 Jun 2018 17:21:11 GMT
Repository: qpid-interop-test
Updated Branches:
  refs/heads/master 2c7cba50c -> 11eb47873


QPIDIT-125: Added Apache license text to each .gitignore file, updated doc files


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/309071ef
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/309071ef
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/309071ef

Branch: refs/heads/master
Commit: 309071ef2793433dd8621964331277856cf6481c
Parents: 2c7cba5
Author: Kim van der Riet <kvdr@localhost.localdomain>
Authored: Fri Jun 29 11:50:26 2018 -0400
Committer: Kim van der Riet <kpvdr@apache.org>
Committed: Fri Jun 29 13:18:54 2018 -0400

----------------------------------------------------------------------
 .gitignore                                      |  18 ++
 QUICKSTART.md                                   | 231 +++++++++----------
 docs/users-guide.txt                            | 109 +++++----
 .../src/amqp_complex_types_test/.gitignore      |  18 ++
 shims/qpid-jms/.gitignore                       |  18 ++
 shims/qpid-jms/src/.gitignore                   |  18 ++
 shims/qpid-proton-cpp/.gitignore                |  18 ++
 .../qpidit/amqp_complex_types_test/.gitignore   |  18 ++
 .../src/amqp_complex_types_test/.gitignore      |  18 ++
 .../rhea-js/amqp_complex_types_test/.gitignore  |  18 ++
 shims/rhea-js/amqp_types_test/.gitignore        |  18 ++
 src/python/qpid_interop_test/.gitignore         |  18 ++
 utils/.gitignore                                |  18 ++
 13 files changed, 374 insertions(+), 164 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/309071ef/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 7bd2757..c52634a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 /target/
 /build/
 /docs/users-guide.html

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/309071ef/QUICKSTART.md
----------------------------------------------------------------------
diff --git a/QUICKSTART.md b/QUICKSTART.md
index 789650c..6f33dba 100644
--- a/QUICKSTART.md
+++ b/QUICKSTART.md
@@ -21,17 +21,21 @@ under the License.
 
 # QUICKSTART GUIDE
 
+## 1. Overview
+
 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 using the CMAKE_INSTALL_PREFIX
-environment variable, for example $HOME/install.
+By default, qpid-interop-test will install to `/usr/local` (and will thus also
+require root privileges), but you can set any non-privileged directory as the
+install prefix using the `CMAKE_INSTALL_PREFIX` environment variable, for
+example `$HOME/install`.
 
 The following tools are needed to build qpid-interop-test:
 
  * git
  * gcc-c++
  * Python 2.7.x
+ * Python 3.x
  * cmake
  * Java JDK
  * Maven
@@ -40,32 +44,47 @@ The following tools are needed to build qpid-interop-test:
 The following Qpid components must be installed *before* you build and install
 qpid-interop-test:
 
- * Qpid Proton (including C++ Proton API)
+ * Qpid Proton C++ development
  * Qpid Python
+ * Python2 Qpid Proton
+ * Python3 Qpid Proton
 
 The following are not required, but if installed and present, will be tested:
 
- * Rhea (a Javascript client, also requires npm and nodejs)
+ * 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.
+ 
+In addition, if you wish to run the tests against a broker on the build machine,
+it will be necessary to have a running broker. One of the following may be
+installed and started against which to run the interop tests as a local broker:
+ 
+ * Artemis Java broker
+ * ActiveMQ Java broker
+ * Qpid C++ broker
+ * Qpid Dispatch router (which may be used as a single node, or as part of a
+ routed configuration)
+
+Any AMQP 1.0 broker should work. Tests can also be run against a
+remote broker provided the broker IP address is known.
+
+These pre-requisites can be installed using the standard system package manager
+(yum, dnf, apt-get etc.) OR built from source and installed.
 
 These are the install steps:
 
 1. Install prerequisites, from packages or source
-2. Install or download / build AMQP brokers to test against (or set up networked brokers)
+2. Install or download / build AMQP brokers to test against
 3. Build qpid-interop-test
 4. Run the tests
 
-## 1. Install prerequisites
+## 2. Install prerequisites
 
-### 1.1 RHEL6
+### 2.1 RHEL6
 
-Currently RHEL6 is not supported because it uses Python 2.6.x, and the test code uses
+Currently **RHEL6 is not supported** because it uses Python 2.6.x, and the test code uses
 features of Python 2.7.x. This may be supported in a future release.
 
-### 1.2 RHEL7
+### 2.2 RHEL7
 
 From a clean install:
 
@@ -84,23 +103,23 @@ yum install epel-release-latest-7.noarch.rpm
 then install the following packages:
 
 ````
-yum install jsoncpp-devel nodejs-rhea qpid-proton-cpp-devel python-qpid-proton
+yum -y install jsoncpp-devel nodejs-rhea qpid-proton-cpp-devel python-qpid-proton qpid-proton-cpp-devel
python2-qpid-proton
 ````
 
-### 1.3 Fedora 27
+### 2.3 Fedora 28
 
 All packages are available directly from the Fedora repositories:
 
 ````
-dnf install gcc-c++ cmake maven java-1.8.0-openjdk-devel perl-XML-XPath jsoncpp-devel nodejs-rhea
qpid-proton-cpp-devel python-qpid-proton
+dnf -y install gcc-c++ cmake maven java-1.8.0-openjdk-devel perl-XML-XPath jsoncpp-devel
nodejs-rhea qpid-proton-cpp-devel python-qpid-proton qpid-proton-cpp-devel python2-qpid-proton
python3-qpid-proton
 ````
 
-### 1.4 CentOS7 Docker image
+### 2.4 CentOS7 Docker image
 
 Docker images come with only the bare essentials, so there is more to install than a standard
bare-metal install:
 
 ````
-yum -y install vim unzip wget git gcc-c++ make cmake maven swig java-1.8.0-openjdk-devel
perl-XML-XPath python-devel
+yum -y install vim unzip wget git gcc-c++ make cmake maven swig java-1.8.0-openjdk-devel
perl-XML-XPath python-devel procps-ng
 ````
 
 Some packages will need to be downloaded from [EPEL](https://fedoraproject.org/wiki/EPEL).
@@ -114,12 +133,16 @@ yum -y install epel-release-latest-7.noarch.rpm
 then install the following packages:
 
 ````
-yum -y install mono-devel python34-devel jsoncpp-devel nodejs-rhea qpid-proton-cpp-devel
python-qpid-proton
+yum -y install mono-devel python34-devel jsoncpp-devel nodejs-rhea qpid-proton-cpp-devel
python-qpid-proton qpid-proton-cpp-devel python2-qpid-proton
 ````
 
-### 1.5 Fedora 27 Docker image
+Note that at the time of release, there is no python3-qpid-proton package available for CentOS7,
but this should be available soon.
 
-(TODO)
+### 2.5 Fedora 28 Docker image
+
+````
+dnf -y install vim unzip wget procps-ng git gcc-c++ make cmake maven swig java-1.8.0-openjdk-devel
perl-XML-XPath python-devel mono-devel python3-devel jsoncpp-devel nodejs-rhea python-qpid-proton
qpid-proton-cpp-devel python2-qpid-proton python3-qpid-proton
+````
 
 ## 2. Obtaining a broker
 
@@ -145,7 +168,11 @@ Download from [Apache](https://activemq.apache.org/artemis/download.html).
 
 ### 2.3 Qpid cpp broker
 
-    yum install qpid-cpp-server
+    yum -y install qpid-cpp-server # CentOS7/RHEL
+
+or
+
+    dnf -y install qpid-cpp-server # Fedora 28
 
 and set the configuration file in /etc/qpid/qpidd.conf as follows:
 
@@ -154,6 +181,14 @@ auth=no
 queue-patterns=qit
 ````
 
+The broker may be started via service, but if running in a Docker container, this may not
work. In this case, start the broker directly:
+
+    /sbin/qpidd -d
+
+and can be stopped with
+
+    /sbin/qpidd -q
+
 ### 2.4 Qpid Dispatch Router
 
     yum install qpid-dispatch-router
@@ -170,98 +205,13 @@ listener {
 
 ````
 
-## 2. Build and install Qpid Proton
-
-Qpid Proton is available as a package. However, this can only contain either Python2
-_OR_ Python3 bindings.  Because QIT tests the Python2 and Python3 bindings against each
-other as separate clients, we need both clients at the same time. Currently, there is
-no "official" install method to do this.
-
-To work around this, QIT relies on the following installation locations for the Python
-client bindings:
-
-Python2:
-````
-${CMAKE_INSTALL_PREFIX}/lib64/proton/bindings/python
-````
-
-and Python3:
-````
-${CMAKE_INSTALL_PREFIX}/lib64/proton/bindings/python3
-````
-
-To build for both clients, the follow the following steps:
-
-### 2.1 Clone Qpid Proton git repo
-
-````
-git clone https://git-wip-us.apache.org/repos/asf/qpid-proton.git
-````
-
-### 2.2 Create a build script to automate the build
-
-Use the following script to build Qpid Proton into a local install directory:
-
-````
-#!/bin/bash
-
-PWD=`pwd`
-
-REDHAT_DIR=${HOME}
-BUILD_DIR=${REDHAT_DIR}/qpid-proton/build
-INSTALL_DIR=${REDHAT_DIR}/install
-
-PY2_INSTALL_DIR=${INSTALL_DIR}/lib64/proton/bindings/python
-CMAKE_PY2_EXECUTABLE=/usr/bin/python
-CMAKE_PY2_INCLUDE_DIR=/usr/include/python2.7
-CMAKE_PY2_LIBRARY=/usr/lib64/libpython2.7.so
-
-PY3_INSTALL_DIR=${INSTALL_DIR}/lib64/proton/bindings/python3
-CMAKE_PY3_EXECUTABLE=/usr/bin/python3.6m
-CMAKE_PY3_INCLUDE_DIR=/usr/include/python3.6m
-CMAKE_PY3_LIBRARY=/usr/lib64/libpython3.6m.so
-
-rm -rf ${PY2_INSTALL_DIR} ${PY3_INSTALL_DIR}
-mkdir -p ${BUILD_DIR}
-cd ${BUILD_DIR}
-
-# First build under Python 3
-cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_PYTHON="ON" -DPYTHON_EXECUTABLE=${CMAKE_PY3_EXECUTABLE}
-DPYTHON_INCLUDE_DIR=${CMAKE_PY3_INCLUDE_DIR} -DPYTHON_LIBRARY=${CMAKE_PY3_LIBRARY} ..
-make install
-mv ${PY2_INSTALL_DIR} ${PY3_INSTALL_DIR}
-
-# Now build under Python 2
-cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DBUILD_PYTHON="ON" -DPYTHON_EXECUTABLE=${CMAKE_PY2_EXECUTABLE}
-DPYTHON_INCLUDE_DIR=${CMAKE_PY2_INCLUDE_DIR} -DPYTHON_LIBRARY=${CMAKE_PY2_LIBRARY} ..
-make install
-
-cd ${PWD}
-echo
-echo "Checking Python libs built:"
-ls -l --color=auto ${INSTALL_DIR}/lib64/proton/bindings/python*/_cproton.so
-echo "done"
-````
-
-NOTE:
-* Adjust REDHAT_DIR if you are not building in your home directory. This is the
-  location where Qpid Proton was cloned in the previous step. This script needs
-  to be located in ${REDHAT_DIR} directory.
-* Check the CMAKE_PY3_* details for your system. For example, on CentOS7, the
-  following changes need to be made:
+The broker may be started via service, but if running in a Docker container, this may not
work. In this case, start the broker directly:
 
-````
-CMAKE_PY3_EXECUTABLE=/usr/bin/python3.4m
-CMAKE_PY3_INCLUDE_DIR=/usr/include/python3.4m
-CMAKE_PY3_LIBRARY=/usr/lib64/libpython3.4m.so
-````
+    /sbin/qdrouterd -d
 
-If the script builds and installs successfully, you should see the following at the end:
+and can be stopped with
 
-````
-Checking Python libs built:
--rwxr-xr-x. 1 kvdr kvdr 1608536 Feb 27 21:00 /home/kvdr/RedHat/install/lib64/proton/bindings/python/_cproton.so
--rwxr-xr-x. 1 kvdr kvdr 1609328 Feb 27 21:00 /home/kvdr/RedHat/install/lib64/proton/bindings/python3/_cproton.so
-done
-````
+    pkill qdrouterd # Needs procps-ng package installed in Docker containers
 
 ## 3. Install qpid-interop-test
 
@@ -271,9 +221,11 @@ option to the `cmake` command. If it is omitted, then qpid-interop-test
will be
 into the default system directories.  The source may be unpacked, or (if you need to use
the
 latest and greatest), cloned from git:
 
-````
-git clone https://git-wip-us.apache.org/repos/asf/qpid-interop-test.git
-````
+    git clone https://git-wip-us.apache.org/repos/asf/qpid-interop-test.git
+    
+or
+    
+    git clone https://github.com/apache/qpid-interop-test.git
 
 Assuming the source tree is located in directory qpid-interop-test:
 
@@ -289,7 +241,7 @@ cmake -DCMAKE_INSTALL_PREFIX=<abs-path-to-local-install-dir> ..
 make install
 ````
 
-For a system install, root privileges are required:
+For a system install (root privileges are required):
 
 ````
 cmake ..
@@ -321,10 +273,14 @@ The available tests are:
 
 | Module | Description | Clients |
 | ------ | ----------- | ------- |
-| amqp_large_content_test | Tests implementation of large messages up to 10MB | C++ Python
AMQP.NetLite |
-| amqp_types_test | Tests the implementation of AMQP 1.0 types | C++ Python Rhea AMQP.NetLite
|
-| jms_hdrs_props_test | Tests JMS headers and properties | C++ JMS Python |
-| jms_messages_test | Tests all JMS message types (except ObjectMessage) | C++ JMS Python
|
+| amqp_complex_types_test | Tests complex AMQP 1.0 types | C++ Python2 Python3 |
+| amqp_large_content_test | Tests implementation of large messages up to 10MB | C++ Python2
Python3 AMQP.NetLite |
+| amqp_types_test | Tests the implementation of AMQP 1.0 types | C++ Python2 Python3 Rhea
AMQP.NetLite |
+| jms_hdrs_props_test | Tests JMS headers and properties | C++ JMS Python2 Python3 |
+| jms_messages_test | Tests all JMS message types (except ObjectMessage) | C++ JMS Python2
Python3 |
+
+Each test has command-line options which can be used to limit or modify the test, use the
`--help` option to see
+these options.
 
 The preferred method to run the tests is using the Python module option as follows:
 
@@ -351,3 +307,40 @@ python -m qpid_interop_test.amqp_types_test --sender <broker-ip-addr-A>
--receiv
 python -m qpid_interop_test.jms_messages_test --sender <broker-ip-addr-A> --receiver
<broker-ip-addr-B>
 ...
 ````
+
+**CentOS7 Note:**
+
+CentOS7 does not have the `python3-qpid-proton` package available at the time of the 0.2.0
release. To avoid
+errors in the test on CentOS7 (which does not yet auto-detect but assumes the availability
of this package), use the
+`--exclude-shim ProtonPython3` command-line parameter to disable this shim. See
+[QPIDIT-126](https://issues.apache.org/jira/browse/QPIDIT-126) for progress and further details
on this issue.
+
+## 5. Optional Components
+
+### 5.1 AMQP.Net Lite Client
+
+(TODO: import details to this document)
+
+A detailed description of how to install and run the AMQP.Net Lite client on Fedora may be
found at Apache
+JIRA [QPIDIT-105](https://issues.apache.org/jira/browse/QPIDIT-105), and can easily be adapted
to other
+Linux operating systems. The following packages need to be installed:
+
+ * Mono
+ * Pre-compiled AMQP.Net Lite library
+
+See the above JIRA for detailed instructions.
+
+### 5.2 Rhea JavaScript Client
+
+The following packages need to be installed:
+ 
+ * nodejs
+ * npm
+
+The Rhea source may be cloned from github:
+
+    git clone https://github.com/amqp/rhea.git
+
+If the `rhea` directory is discovered when qpid-interop-test runs `cmake`, then the Rhea
client tests
+will be enabled. If the directory is not found, it may be set through the `RHEA_DIR` variable
+when running `cmake`.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/309071ef/docs/users-guide.txt
----------------------------------------------------------------------
diff --git a/docs/users-guide.txt b/docs/users-guide.txt
index 2524afc..85269a0 100644
--- a/docs/users-guide.txt
+++ b/docs/users-guide.txt
@@ -33,7 +33,8 @@ under test. For example, the amqp_types test has shims for the following
 clients:
 * AmqpNetLite
 * ProtonCpp
-* ProtonPython
+* ProtonPython2
+* ProtonPython3
 * RheaJS
 
 To obtain both self- and interoperability testing, each test program will
@@ -46,23 +47,32 @@ following combinations of shims being used:
 
 |1 |AmqpNetLite | AmqpNetLite
 |2 |AmqpNetLite | ProtonCpp
-|3 |AmqpNetLite | ProtonPython
-|4 |AmqpNetLite | RheaJS
-|5 |ProtonCpp | AmqpNetLite
-|6 |ProtonCpp | ProtonCpp
-|7 |ProtonCpp | ProtonPython
-|8 |ProtonCpp | RheaJS
-|9 |ProtonPython | AmqpNetLite
-|10 |ProtonPython | ProtonCpp
-|11 |ProtonPython | ProtonPython
-|12 |ProtonPython | RheaJS
-|13 |RheaJS | AmqpNetLite
-|14 |RheaJS | ProtonCpp
-|15 |RheaJS | ProtonPython
-|16 |RheaJS | RheaJS
+|3 |AmqpNetLite | ProtonPython2
+|4 |AmqpNetLite | ProtonPython3
+|5 |AmqpNetLite | RheaJS
+|6 |ProtonCpp | AmqpNetLite
+|7 |ProtonCpp | ProtonCpp
+|8 |ProtonCpp | ProtonPython2
+|9 |ProtonCpp | ProtonPython3
+|10 |ProtonCpp | RheaJS
+|11 |ProtonPython2 | AmqpNetLite
+|12 |ProtonPython2 | ProtonCpp
+|13 |ProtonPython2 | ProtonPython2
+|14 |ProtonPython2 | ProtonPython3
+|15 |ProtonPython2 | RheaJS
+|16 |ProtonPython3 | AmqpNetLite
+|17 |ProtonPython3 | ProtonCpp
+|18 |ProtonPython3 | ProtonPython2
+|19 |ProtonPython3 | ProtonPython3
+|20 |ProtonPython3 | RheaJS
+|21 |RheaJS | AmqpNetLite
+|22 |RheaJS | ProtonCpp
+|23 |RheaJS | ProtonPython2
+|24 |RheaJS | ProtonPython3
+|25 |RheaJS | RheaJS
 |===
 
-so that for each test case, 16 individual tests are run. The test program
+so that for each test case, 25 individual tests are run. The test program
 will by default run all the available shims against each other in this way,
 but it is possible to control which shims are used using the --include-shim
 or --exclude-shim arguments (see below).
@@ -70,15 +80,17 @@ or --exclude-shim arguments (see below).
 == 2. Obtaining
 qpid-interop-test is an Apache Qpid project.
 
-Web page: xxx
+Web page: https://qpid.apache.org/components/interop-test/index.html
 
-Download soruce: xxx
+Download soruce: https://qpid.apache.org/download.html
+
+Git: https://github.com/apache/qpid-interop-test.git
 
 == 3. Building
 
 === a. Install dependencies:
-   * Build tools: git, gcc, cmake
-   * Qpid Proton: qpid-proton-c-devel
+   * Build tools: git, gcc-c++, cmake, maven, json-cpp
+   * Qpid Proton: qpid-proton-cpp-devel, python2-qpid-proton, python3-qpid-proton
 
 === b. Decide on local vs system install
 ==== Local install:
@@ -94,27 +106,7 @@ Installs the files into traditional system locations. This type of install
 requires root privileges. As the files are located in expected locations, no
 environment settings need be made.
 
-=== c. Build qpid-proton
-*System install:*
-----
- $ cd qpid-proton
- $ mkdir build
- $ cd build
- $ cmake ..
- $ make
- $ sudo make install
-----
-
-*Local install:*
-----
- $ cd qpid-proton
- $ mkdir build
- $ cd build
- $ cmake ..
- $ make install
-----
-
-=== d. Build qpid-interop-test
+=== c. Build qpid-interop-test
 *System install:*
 ----
  $ cd qpid-interop-test
@@ -130,14 +122,14 @@ environment settings need be made.
  $ cd qpid-interop-test
  $ mkdir build
  $ cd build
- $ cmake ..
+ $ cmake -DCMAKE_INSTALL_PREFIX=<path/to/local/install/dir> ..
  $ make install
 ----
 
 == 4. Running
 
-The tests assume a broker is available and running. The assumed default is at
-`localhost:5672`. For other broker location(s), use the `--sender` and `--receiver`
+The tests by default assume a broker is available and running. The assumed default
+is at `localhost:5672`. For other broker location(s), use the `--sender` and `--receiver`
 arguments to specify where the clients should interact, see below.
 
 The tests do not start or stop brokers.
@@ -177,10 +169,17 @@ Each test is executed directly.
                Format: For our current brokers: one of: "ActiveMQ", "qpid-cpp",
                "qpid-dispatch-router". Artemis does not currently pass its name
                in connection properties, and is equivalent to "None".
+|`--timeout' |Timeout for the test in seconds (default: 10 seconds, may vary with test).
If the
+              test does not complete within this time, it will be terminated and marked as
a
+              failure.
 |`--include-shim` |Name of shim to include. Cannot be used together with `--exclude-shim`.
May
                be used multiple times to include more than one shim.
 |`--exclude-shim` |Name of shim to exclude. Cannot be used together with `--include-shim`.
May
                be used multiple times to exclude more that one shim.
+|`--xunit-log` |Enable the generation of xUnit log files at the conclusion of the tests.
|
+|`--xunit-log-dir` |Path where xUnit log files are written.
+|`--description` |Description of test used in xUnit log file.
+|`--broker-topology` | Description of broker and broker topology (where needed) used in xUnit
log file.
 |===
 
 .amqp-types-test
@@ -192,6 +191,22 @@ Each test is executed directly.
                    May be used multiple times to exclude more than one type.
 |===
 
+.amqp-complex-types-test
+[cols="20%,80%"]
+|===
+|`--include-type` |Name of AMQP complex type to include. Cannot be used together with `--exclude-type`.
+                   May be used multiple times to include more than one type.
+|`--exclude-type` |Name of AMQP complex type to exclude. Cannot be used together with `--include-type`.
+                   May be used multiple times to exclude more than one type.
+|`--include-subtype` |Name of AMQP subtype to include. This is the AMQP type used within
a primary complex
+                      type (for example, the types used within an AMQP list). Cannot be used
together with
+                      `--exclude-subtype`. May be used multiple times to include more than
one subtype.
+                      NOTE: There is a special `*` wildcard that can be used for this, and
will allow
+                      all valid types to be used together in the same test.
+|`--exclude-subtype` |Name of AMQP subtype to exclude.  Cannot be used together with
+                      `--include-subtype`. May be used multiple times to exclude more than
one subtype.
+|===
+
 .amqp-large-content-test
 |===
 |No other parameters. There is currently no way to select/limit the message size, but there
@@ -259,5 +274,9 @@ the test.
  AssertionError: JmsReceiver error: Unexpected JMS message header: JMS_PRIORITY: Expected
default priority (4), found priority 0
 ----
 
-Currently, the tests do not produce log files.
+Currently, the tests do not produce text log files. However, by using the `--xunit-log` command-line
option, xunit log files
+will be generated at the conclusion of the test in the `xunit_logs` directory. The directory
may be changed by
+using the `--xunit-log-dir` command-line option. Log file management is the responsibility
of the user, and if
+xunit logging is used regularly, these files will accumulate, possibly exhausting the available
disk space. NOTE
+that if a test is interrupted (by using ctl+c, for example), then the log files will not
be generated.)
 

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/309071ef/shims/amqpnetlite/src/amqp_complex_types_test/.gitignore
----------------------------------------------------------------------
diff --git a/shims/amqpnetlite/src/amqp_complex_types_test/.gitignore b/shims/amqpnetlite/src/amqp_complex_types_test/.gitignore
index 918f79c..ac974fc 100644
--- a/shims/amqpnetlite/src/amqp_complex_types_test/.gitignore
+++ b/shims/amqpnetlite/src/amqp_complex_types_test/.gitignore
@@ -1 +1,19 @@
+#
+# 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.
+#
 /amqp_complex_types_test_data.cs

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/309071ef/shims/qpid-jms/.gitignore
----------------------------------------------------------------------
diff --git a/shims/qpid-jms/.gitignore b/shims/qpid-jms/.gitignore
index c0fa915..54b3db8 100644
--- a/shims/qpid-jms/.gitignore
+++ b/shims/qpid-jms/.gitignore
@@ -1,2 +1,20 @@
+#
+# 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.
+#
 /cp.txt
 /target/

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/309071ef/shims/qpid-jms/src/.gitignore
----------------------------------------------------------------------
diff --git a/shims/qpid-jms/src/.gitignore b/shims/qpid-jms/src/.gitignore
index ae3c172..242b90c 100644
--- a/shims/qpid-jms/src/.gitignore
+++ b/shims/qpid-jms/src/.gitignore
@@ -1 +1,19 @@
+#
+# 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.
+#
 /bin/

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/309071ef/shims/qpid-proton-cpp/.gitignore
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/.gitignore b/shims/qpid-proton-cpp/.gitignore
index 84c048a..6ef552f 100644
--- a/shims/qpid-proton-cpp/.gitignore
+++ b/shims/qpid-proton-cpp/.gitignore
@@ -1 +1,19 @@
+#
+# 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.
+#
 /build/

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/309071ef/shims/qpid-proton-cpp/src/qpidit/amqp_complex_types_test/.gitignore
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/amqp_complex_types_test/.gitignore b/shims/qpid-proton-cpp/src/qpidit/amqp_complex_types_test/.gitignore
index ce0dc65..2ee6fa2 100644
--- a/shims/qpid-proton-cpp/src/qpidit/amqp_complex_types_test/.gitignore
+++ b/shims/qpid-proton-cpp/src/qpidit/amqp_complex_types_test/.gitignore
@@ -1 +1,19 @@
+#
+# 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.
+#
 /amqp_complex_types_test_data.cpp

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/309071ef/shims/qpid-proton-python/src/amqp_complex_types_test/.gitignore
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/amqp_complex_types_test/.gitignore b/shims/qpid-proton-python/src/amqp_complex_types_test/.gitignore
index 3917f7f..d1207b1 100644
--- a/shims/qpid-proton-python/src/amqp_complex_types_test/.gitignore
+++ b/shims/qpid-proton-python/src/amqp_complex_types_test/.gitignore
@@ -1 +1,19 @@
+#
+# 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.
+#
 /amqp_complex_types_test_data.py

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/309071ef/shims/rhea-js/amqp_complex_types_test/.gitignore
----------------------------------------------------------------------
diff --git a/shims/rhea-js/amqp_complex_types_test/.gitignore b/shims/rhea-js/amqp_complex_types_test/.gitignore
index 1ddf6e7..388d296 100644
--- a/shims/rhea-js/amqp_complex_types_test/.gitignore
+++ b/shims/rhea-js/amqp_complex_types_test/.gitignore
@@ -1 +1,19 @@
+#
+# 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.
+#
 /amqp_complex_types_test_data.js

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/309071ef/shims/rhea-js/amqp_types_test/.gitignore
----------------------------------------------------------------------
diff --git a/shims/rhea-js/amqp_types_test/.gitignore b/shims/rhea-js/amqp_types_test/.gitignore
index 2ccbe46..8b03cc7 100644
--- a/shims/rhea-js/amqp_types_test/.gitignore
+++ b/shims/rhea-js/amqp_types_test/.gitignore
@@ -1 +1,19 @@
+#
+# 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.
+#
 /node_modules/

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/309071ef/src/python/qpid_interop_test/.gitignore
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/.gitignore b/src/python/qpid_interop_test/.gitignore
index a42f904..0881af2 100644
--- a/src/python/qpid_interop_test/.gitignore
+++ b/src/python/qpid_interop_test/.gitignore
@@ -1,3 +1,21 @@
+#
+# 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.
+#
 /qit_errors.pyc
 /shim_utils.pyc
 /qit_broker_props.pyc

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/309071ef/utils/.gitignore
----------------------------------------------------------------------
diff --git a/utils/.gitignore b/utils/.gitignore
index b83d222..27220f2 100644
--- a/utils/.gitignore
+++ b/utils/.gitignore
@@ -1 +1,19 @@
+#
+# 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.
+#
 /target/


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


Mime
View raw message