diff options
| author | Keith Wall <kwall@apache.org> | 2015-03-03 14:58:01 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2015-03-03 14:58:01 +0000 |
| commit | 11a201863b9c989151cf117450785504a61df5ce (patch) | |
| tree | ba96c870aa9ed34edcac0bd07fc0e0138f715bbd /qpid/cpp/src/tests/qpid-txtest2.cpp | |
| parent | 9dc57fe738f366d875c2319dafdfa2c50ce2f20b (diff) | |
| parent | 83120216de949c1cae3004c74475cc6c54cd61f1 (diff) | |
| download | qpid-python-11a201863b9c989151cf117450785504a61df5ce.tar.gz | |
merge from trunk
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1663719 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/qpid-txtest2.cpp')
| -rw-r--r-- | qpid/cpp/src/tests/qpid-txtest2.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/qpid-txtest2.cpp b/qpid/cpp/src/tests/qpid-txtest2.cpp index 2393ec2396..58c48f9a8d 100644 --- a/qpid/cpp/src/tests/qpid-txtest2.cpp +++ b/qpid/cpp/src/tests/qpid-txtest2.cpp @@ -353,10 +353,11 @@ int main(int argc, char** argv) if (opts.init) controller.init(); if (opts.transfer) controller.transfer(); if (opts.check) return controller.check(); + return 0; } - return 0; + return 1; } catch(const std::exception& e) { - std::cout << argv[0] << ": " << e.what() << std::endl; + std::cerr << argv[0] << ": " << e.what() << std::endl; } return 2; } |
