diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/rpc/unit-test/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/rpc/unit-test/rpc_test_setup.sh | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/lib/rpc/unit-test/ChangeLog b/src/lib/rpc/unit-test/ChangeLog index 0a21776c38..b41a59d78e 100644 --- a/src/lib/rpc/unit-test/ChangeLog +++ b/src/lib/rpc/unit-test/ChangeLog @@ -1,3 +1,8 @@ +2000-06-30 Ken Raeburn <raeburn@mit.edu> + + * rpc_test_setup.sh: Error out if server_handle doesn't get set in + the Tcl script. + 2000-06-08 Tom Yu <tlyu@mit.edu> * lib/helpers.exp (kinit): Move "expect eof" into the commands diff --git a/src/lib/rpc/unit-test/rpc_test_setup.sh b/src/lib/rpc/unit-test/rpc_test_setup.sh index 461b1cc909..0f8ca9d932 100644 --- a/src/lib/rpc/unit-test/rpc_test_setup.sh +++ b/src/lib/rpc/unit-test/rpc_test_setup.sh @@ -27,6 +27,7 @@ cat - > /tmp/rpc_test_setup$$ <<\EOF source $env(TCLUTIL) set h $env(CANON_HOST) puts stdout [ovsec_kadm_init admin admin $OVSEC_KADM_ADMIN_SERVICE null $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 server_handle] +if ![info exists server_handle] { exit 1 } puts stdout [ovsec_kadm_create_principal $server_handle [simple_principal server/$h] {OVSEC_KADM_PRINCIPAL} admin] puts stdout [ovsec_kadm_randkey_principal $server_handle server/$h key] puts stdout [ovsec_kadm_create_principal $server_handle [simple_principal notserver/$h] {OVSEC_KADM_PRINCIPAL} admin] @@ -34,6 +35,11 @@ puts stdout [ovsec_kadm_randkey_principal $server_handle notserver/$h key] puts stdout [ovsec_kadm_destroy $server_handle] EOF eval "$CLNTTCL $REDIRECT < /tmp/rpc_test_setup$$" +if test $? != 0 ; then + rm /tmp/rpc_test_setup$$ + echo 1>&2 error setting up database for tests + exit 1 +fi rm /tmp/rpc_test_setup$$ rm -f $RPC_TEST_SRVTAB |