summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/sasl_fed
diff options
context:
space:
mode:
authorMichael Goulish <mgoulish@apache.org>2010-10-28 04:39:43 +0000
committerMichael Goulish <mgoulish@apache.org>2010-10-28 04:39:43 +0000
commit591732bbaf0b25ab4e35440d679688fd2e1041f4 (patch)
tree205019ca2407600e9207eb4ba64e04fc4970da8a /qpid/cpp/src/tests/sasl_fed
parent5e9bd057a21f3d29d9ed3c4879a8b952dba4bae0 (diff)
downloadqpid-python-591732bbaf0b25ab4e35440d679688fd2e1041f4.tar.gz
Add a small executable that prints out the sasl version number in integer form.
Use it in the sasl_fed test to determine whether that test can run. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1028180 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/sasl_fed')
-rwxr-xr-xqpid/cpp/src/tests/sasl_fed15
1 files changed, 12 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/sasl_fed b/qpid/cpp/src/tests/sasl_fed
index b57c57f89a..e65adae171 100755
--- a/qpid/cpp/src/tests/sasl_fed
+++ b/qpid/cpp/src/tests/sasl_fed
@@ -19,11 +19,20 @@
# under the License.
#
-# disable this test for all sasl verisons temporarily until TODO, below, is completed.
-exit 0
-
source test_env.sh
+# This minimum value corresponds to sasl version 2.1.22
+minimum_sasl_version=131350
+
+sasl_version=`$QPID_TEST_EXEC_DIR/sasl_version`
+
+# This test is necessary becasue this sasl version is the first one that permits
+# redirection of the sasl config file path.
+if [ "$sasl_version" -lt "$minimum_sasl_version" ]; then
+ echo "sasl_fed: must have sasl version 2.1.22 or greater. Version is: $sasl_version"
+ exit 0
+fi
+
sasl_config_file=$builddir/sasl_config
my_random_number=$RANDOM