diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/rpc/unit-test/ChangeLog | 3 | ||||
| -rw-r--r-- | src/lib/rpc/unit-test/rpc_test_setup.sh | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/rpc/unit-test/ChangeLog b/src/lib/rpc/unit-test/ChangeLog index f97a54dc4..f6fcc7e81 100644 --- a/src/lib/rpc/unit-test/ChangeLog +++ b/src/lib/rpc/unit-test/ChangeLog @@ -1,5 +1,8 @@ Mon Nov 11 20:52:27 1996 Tom Yu <tlyu@mit.edu> + * rpc_test_setup.sh: Use a temp file rather than a here document + feeding into eval because Ultrix sh doesn't deal. + * configure.in: Add AC_CANONICAL_HOST to deal with new pre.in. Mon Nov 11 14:22:30 1996 Tom Yu <chaoself@avalanche-breakdown.mit.edu> diff --git a/src/lib/rpc/unit-test/rpc_test_setup.sh b/src/lib/rpc/unit-test/rpc_test_setup.sh index 7bdb08866..d31ae89be 100644 --- a/src/lib/rpc/unit-test/rpc_test_setup.sh +++ b/src/lib/rpc/unit-test/rpc_test_setup.sh @@ -13,9 +13,9 @@ DUMMY=${TCLUTIL=$TESTDIR/tcl/util.t}; export TCLUTIL DUMMY=${MAKE_KEYTAB=$TESTDIR/scripts/make-host-keytab.pl} # If it's set, set it to true -VERBOSE=${VERBOSE_TEST:+true} +VERBOSE=${VERBOSE_TEST+true} # Otherwise, set it to false -DUMMY=${VERBOSE:=false} +DUMMY=${VERBOSE=false} if $VERBOSE; then REDIRECT= @@ -28,7 +28,7 @@ PATH=$TOP/install/admin:$PATH; export PATH CANON_HOST=`$QUALNAME` export CANON_HOST -eval $CLNTTCL <<'EOF' $REDIRECT +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] @@ -38,6 +38,8 @@ puts stdout [ovsec_kadm_create_principal $server_handle [simple_principal notser 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$$" +rm /tmp/rpc_test_setup$$ rm -f $RPC_TEST_SRVTAB |