diff options
Diffstat (limited to 'jrt_test/src/tests/mockup-invoke')
| -rw-r--r-- | jrt_test/src/tests/mockup-invoke/dotest.sh | 27 | ||||
| -rwxr-xr-x | jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh | 12 | ||||
| -rw-r--r-- | jrt_test/src/tests/mockup-invoke/progdefs.sh | 2 |
3 files changed, 21 insertions, 20 deletions
diff --git a/jrt_test/src/tests/mockup-invoke/dotest.sh b/jrt_test/src/tests/mockup-invoke/dotest.sh index fcbdc16f92e..f7fcf007c56 100644 --- a/jrt_test/src/tests/mockup-invoke/dotest.sh +++ b/jrt_test/src/tests/mockup-invoke/dotest.sh @@ -1,20 +1,19 @@ #!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -set -e -sh $BINREF/progctl.sh progdefs.sh start server 1 +fail=0 -$BINREF/runjava PollRPCServer tcp/localhost:$PORT_0 -$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 aaa bbb > out.txt -$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 bbb ccc >> out.txt -$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 ccc ddd >> out.txt -$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 ddd eee >> out.txt -$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 eee fff >> out.txt +$BINREF/progctl.sh progdefs.sh start server 1 -sh $BINREF/progctl.sh progdefs.sh stop server 1 +$BINREF/runjava PollRPCServer tcp/localhost:$PORT_0 || fail=1 +$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 aaa bbb > out.txt || fail=1 +$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 bbb ccc >> out.txt || fail=1 +$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 ccc ddd >> out.txt || fail=1 +$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 ddd eee >> out.txt || fail=1 +$BINREF/runjava MockupInvoke tcp/localhost:$PORT_0 eee fff >> out.txt || fail=1 -if diff -u out.txt ref.txt; then - exit 0 -else - exit 1 -fi +$BINREF/progctl.sh progdefs.sh stop server 1 + +diff -u out.txt ref.txt || fail=1 + +exit $fail diff --git a/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh b/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh index 84343a7a60b..516b6abef63 100755 --- a/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh +++ b/jrt_test/src/tests/mockup-invoke/mockup-invoke_test.sh @@ -1,11 +1,15 @@ #!/bin/bash -set -e + +fail=0 . ../../binref/env.sh export PORT_0 -$BINREF/compilejava MockupInvoke.java +$BINREF/compilejava MockupInvoke.java || fail=1 + +bash ./dotest.sh || fail=1 + +$BINREF/progctl.sh progdefs.sh stop all -bash -e dotest.sh || (bash -e $BINREF/progctl.sh progdefs.sh stop all; false) -bash -e $BINREF/progctl.sh progdefs.sh stop all +exit $fail diff --git a/jrt_test/src/tests/mockup-invoke/progdefs.sh b/jrt_test/src/tests/mockup-invoke/progdefs.sh index 6898513badc..4c483b8060b 100644 --- a/jrt_test/src/tests/mockup-invoke/progdefs.sh +++ b/jrt_test/src/tests/mockup-invoke/progdefs.sh @@ -1,4 +1,2 @@ -#!/bin/bash # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -set -e prog server 1 "tcp/$PORT_0" "./jrt_test_mockup-server_app" |