diff options
| author | Justin Ross <jross@apache.org> | 2016-04-21 12:31:34 +0000 |
|---|---|---|
| committer | Justin Ross <jross@apache.org> | 2016-04-21 12:31:34 +0000 |
| commit | 71149592670f7592886751a9a866459bef0f12cc (patch) | |
| tree | e4d1fd948055e36d1560112a318e77a210506d06 /qpid/cpp/src/tests/sasl_test_setup.sh | |
| parent | a835fb2724824dcd8a470fb51424cedeb6b38f62 (diff) | |
| download | qpid-python-71149592670f7592886751a9a866459bef0f12cc.tar.gz | |
QPID-7207: Create independent cpp and python subtrees, with content from tools and extras
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1740289 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/sasl_test_setup.sh')
| -rwxr-xr-x | qpid/cpp/src/tests/sasl_test_setup.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/qpid/cpp/src/tests/sasl_test_setup.sh b/qpid/cpp/src/tests/sasl_test_setup.sh index d41efbe6e5..1416759da7 100755 --- a/qpid/cpp/src/tests/sasl_test_setup.sh +++ b/qpid/cpp/src/tests/sasl_test_setup.sh @@ -18,9 +18,10 @@ # specific language governing permissions and limitations # under the License. # -source ./test_env.sh -test -x $SASL_PW || { echo Skipping SASL test, saslpasswd2 not found; exit 0; } +source env.sh + +test -x $SASLPASSWD2 || { echo Skipping SASL test, saslpasswd2 not found; exit 0; } mkdir -p sasl_config @@ -36,7 +37,7 @@ EOF # Populate temporary sasl db. SASLTEST_DB=./sasl_config/qpidd.sasldb rm -f $SASLTEST_DB -echo guest | $SASL_PW -c -p -f $SASLTEST_DB -u QPID guest -echo zig | $SASL_PW -c -p -f $SASLTEST_DB -u QPID zig -echo zag | $SASL_PW -c -p -f $SASLTEST_DB -u QPID zag +echo guest | $SASLPASSWD2 -c -p -f $SASLTEST_DB -u QPID guest +echo zig | $SASLPASSWD2 -c -p -f $SASLTEST_DB -u QPID zig +echo zag | $SASLPASSWD2 -c -p -f $SASLTEST_DB -u QPID zag |