* api.0/chpass-principal.exp:

	* api.0/crte-policy.exp:
	* api.0/crte-principal.exp:
	* api.0/destroy.exp:
	* api.0/dlte-policy.exp:
	* api.0/dlte-principal.exp:
	* api.0/get-policy.exp:
	* api.0/get-principal.exp:
	* api.0/init.exp:
	* api.0/mod-policy.exp:
	* api.0/mod-principal.exp:
	* api.0/randkey-principal.exp:
	* api.0/rename-principal.exp:
	* api.1/lock.exp:
	* api.2/chpass-principal-v2.exp:
	* api.2/chpass-principal.exp:
	* api.2/crte-policy.exp:
	* api.2/crte-principal.exp:
	* api.2/destroy.exp:
	* api.2/dlte-policy.exp:
	* api.2/dlte-principal.exp:
	* api.2/get-policy.exp:
	* api.2/get-principal-v2.exp:
	* api.2/get-principal.exp:
	* api.2/init-v2.exp:
	* api.2/init.exp:
	* api.2/mod-policy.exp:
	* api.2/mod-principal-v2.exp:
	* api.2/mod-principal.exp:
	* api.2/randkey-principal-v2.exp:
	* api.2/randkey-principal.exp:
	* lib/lib.t: s/error/perror.

	* config/unix.exp: Work around tcl 8.4's (incorrect?) output EOL
	translation.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14866 dc483132-0cff-0310-8789-dd5450dbe970

34 files changed, 882 insertions, 836 deletions

diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog
index f908608b85..660b75ca45 100644
--- a/src/lib/kadm5/unit-test/ChangeLog
+++ b/src/lib/kadm5/unit-test/ChangeLog
@@ -1,3 +1,41 @@
+2002-09-15  Tom Yu  <tlyu@mit.edu>
+
+	* api.0/chpass-principal.exp:
+	* api.0/crte-policy.exp:
+	* api.0/crte-principal.exp:
+	* api.0/destroy.exp:
+	* api.0/dlte-policy.exp:
+	* api.0/dlte-principal.exp:
+	* api.0/get-policy.exp:
+	* api.0/get-principal.exp:
+	* api.0/init.exp:
+	* api.0/mod-policy.exp:
+	* api.0/mod-principal.exp:
+	* api.0/randkey-principal.exp:
+	* api.0/rename-principal.exp:
+	* api.1/lock.exp:
+	* api.2/chpass-principal-v2.exp:
+	* api.2/chpass-principal.exp:
+	* api.2/crte-policy.exp:
+	* api.2/crte-principal.exp:
+	* api.2/destroy.exp:
+	* api.2/dlte-policy.exp:
+	* api.2/dlte-principal.exp:
+	* api.2/get-policy.exp:
+	* api.2/get-principal-v2.exp:
+	* api.2/get-principal.exp:
+	* api.2/init-v2.exp:
+	* api.2/init.exp:
+	* api.2/mod-policy.exp:
+	* api.2/mod-principal-v2.exp:
+	* api.2/mod-principal.exp:
+	* api.2/randkey-principal-v2.exp:
+	* api.2/randkey-principal.exp:
+	* lib/lib.t: s/error/perror.
+
+	* config/unix.exp: Work around tcl 8.4's (incorrect?) output EOL
+	translation.
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/lib/kadm5/unit-test/api.0/chpass-principal.exp b/src/lib/kadm5/unit-test/api.0/chpass-principal.exp
index 6e69e5700a..93869f7d79 100644
--- a/src/lib/kadm5/unit-test/api.0/chpass-principal.exp
+++ b/src/lib/kadm5/unit-test/api.0/chpass-principal.exp
@@ -20,7 +20,7 @@ proc test180 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
@@ -28,7 +28,7 @@ proc test180 {} {
     } $test]
 
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -52,14 +52,14 @@ proc test1805 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
 	ovsec_kadm_chpass_principal $server_handle "%s/a" FoobarBax
     } $test]
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -81,14 +81,14 @@ proc test180625 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_chpass_principal $server_handle "%s/a" password
     } $test] "AUTH"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -112,14 +112,14 @@ proc test18075 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_chpass_principal $server_handle "%s/a" Foobar
     } $test] "AUTH_CHANGEPW"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -134,14 +134,14 @@ proc test182 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {
 	ovsec_kadm_chpass_principal $server_handle kadmin/history password
     } "PROTECT"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -160,14 +160,14 @@ proc test183 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_chpass_principal null "%s/a" password
     } $test] "BAD_SERVER_HANDLE"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.0/crte-policy.exp b/src/lib/kadm5/unit-test/api.0/crte-policy.exp
index 685631b064..e2d02a37f8 100644
--- a/src/lib/kadm5/unit-test/api.0/crte-policy.exp
+++ b/src/lib/kadm5/unit-test/api.0/crte-policy.exp
@@ -17,7 +17,7 @@ proc test1 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -25,7 +25,7 @@ proc test1 {} {
 		0xF01000
     } $test] "BAD_MASK"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-        error "$test: unexpected failure in destroy"
+        perror "$test: unexpected failure in destroy"
         return
     }
 }
@@ -45,7 +45,7 @@ proc test2 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -53,7 +53,7 @@ proc test2 {} {
 		{OVSEC_KADM_POLICY}
     } $test] "AUTH_ADD"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy";
+	perror "$test: unexpected failure in destroy";
 	return
     }
 }
@@ -74,7 +74,7 @@ proc test3 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -82,7 +82,7 @@ proc test3 {} {
 		0x000000
     } $test] "BAD_MASK"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-        error "$test: unexpected failure in destroy"
+        perror "$test: unexpected failure in destroy"
         return
     }
 }
@@ -103,7 +103,7 @@ proc test4 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -111,7 +111,7 @@ proc test4 {} {
 		{OVSEC_KADM_POLICY OVSEC_KADM_REF_COUNT}
     } $test] "BAD_MASK"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-        error "$test: unexpected failure in destroy"
+        perror "$test: unexpected failure in destroy"
         return
     }
 }
@@ -127,7 +127,7 @@ proc test5 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -135,7 +135,7 @@ proc test5 {} {
 		{OVSEC_KADM_POLICY}
     } $test] "BAD_POLICY"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-        error "$test: unexpected failure in destroy"
+        perror "$test: unexpected failure in destroy"
         return
     }
 }
@@ -153,7 +153,7 @@ proc test6 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {
@@ -161,7 +161,7 @@ proc test6 {} {
 		{OVSEC_KADM_POLICY}
     } "DUP"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -180,7 +180,7 @@ proc test7 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {
@@ -188,7 +188,7 @@ proc test7 {} {
 		{OVSEC_KADM_POLICY}
     } "EINVAL"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-        error "$test: unexpected failure in destroy"
+        perror "$test: unexpected failure in destroy"
         return
     }
 }
@@ -204,7 +204,7 @@ proc test8 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {
@@ -212,7 +212,7 @@ proc test8 {} {
 		{OVSEC_KADM_POLICY}
     } "BAD_POLICY"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -235,7 +235,7 @@ proc test9 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -257,7 +257,7 @@ proc test9 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -280,7 +280,7 @@ proc test10 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -302,7 +302,7 @@ proc test10 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -325,7 +325,7 @@ proc test11 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -348,7 +348,7 @@ proc test11 {} {
     }
     
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -371,7 +371,7 @@ proc test12 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -393,7 +393,7 @@ proc test12 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -416,7 +416,7 @@ proc test13 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -424,7 +424,7 @@ proc test13 {} {
 		{OVSEC_KADM_POLICY OVSEC_KADM_PW_MIN_LENGTH}
     } $test] "BAD_LENGTH"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -447,7 +447,7 @@ proc test14 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -470,7 +470,7 @@ proc test14 {} {
     }
     
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -492,7 +492,7 @@ proc test15 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -500,7 +500,7 @@ proc test15 {} {
 		{OVSEC_KADM_POLICY OVSEC_KADM_PW_MIN_CLASSES}
     } $test] "BAD_CLASS"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -523,7 +523,7 @@ proc test16 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -546,7 +546,7 @@ proc test16 {} {
     }
     
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -568,7 +568,7 @@ proc test17 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -590,7 +590,7 @@ proc test17 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -611,7 +611,7 @@ proc test18 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -619,7 +619,7 @@ proc test18 {} {
 		{OVSEC_KADM_POLICY OVSEC_KADM_PW_MIN_CLASSES}
     } $test] "BAD_CLASS"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -640,7 +640,7 @@ proc test19 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -648,7 +648,7 @@ proc test19 {} {
 		{OVSEC_KADM_POLICY OVSEC_KADM_PW_HISTORY_NUM}
     } $test] "BAD_HISTORY"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -670,7 +670,7 @@ proc test20 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd  [format {
@@ -692,7 +692,7 @@ proc test20 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -715,7 +715,7 @@ proc test21 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -737,7 +737,7 @@ proc test21 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -762,7 +762,7 @@ proc test215 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
 
@@ -771,7 +771,7 @@ proc test215 {} {
 		{OVSEC_KADM_POLICY OVSEC_KADM_PW_HISTORY_NUM}
     } $test] "BAD_HISTORY"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -793,7 +793,7 @@ proc test22 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -801,7 +801,7 @@ proc test22 {} {
 		{OVSEC_KADM_POLICY}
     } $test] "AUTH_ADD"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -822,7 +822,7 @@ proc test23 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -830,7 +830,7 @@ proc test23 {} {
 		{OVSEC_KADM_POLICY}
     } $test] "AUTH_ADD"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -852,7 +852,7 @@ proc test24 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -860,7 +860,7 @@ proc test24 {} {
 		{OVSEC_KADM_POLICY}
     } $test] "AUTH_ADD"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -882,7 +882,7 @@ proc test25 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -890,7 +890,7 @@ proc test25 {} {
 		{OVSEC_KADM_POLICY}
     } $test] "AUTH_ADD"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -911,7 +911,7 @@ proc test26 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
@@ -919,7 +919,7 @@ proc test26 {} {
 		{OVSEC_KADM_POLICY}
     } $test]
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -941,7 +941,7 @@ proc test27 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
@@ -949,7 +949,7 @@ proc test27 {} {
 		{OVSEC_KADM_POLICY}
     } $test]
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -965,14 +965,14 @@ proc test28 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {
 	ovsec_kadm_create_policy $server_handle null {OVSEC_KADM_POLICY}
     } "EINVAL"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-        error "$test: unexpected failure in destroy"
+        perror "$test: unexpected failure in destroy"
         return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.0/crte-principal.exp b/src/lib/kadm5/unit-test/api.0/crte-principal.exp
index a3f69b978b..676a83013b 100644
--- a/src/lib/kadm5/unit-test/api.0/crte-principal.exp
+++ b/src/lib/kadm5/unit-test/api.0/crte-principal.exp
@@ -25,7 +25,7 @@ proc test2 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {
@@ -33,7 +33,7 @@ proc test2 {} {
 		{OVSEC_KADM_PRINCIPAL} testpass
     } "EINVAL"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"
@@ -51,7 +51,7 @@ proc test3 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -59,7 +59,7 @@ proc test3 {} {
 		{OVSEC_KADM_PRINCIPAL} null
     } $test] "EINVAL"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"    
@@ -76,7 +76,7 @@ proc test4 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -84,7 +84,7 @@ proc test4 {} {
 		{OVSEC_KADM_PRINCIPAL} ""
     } $test] "_Q_TOOSHORT"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"     
@@ -100,7 +100,7 @@ proc test5 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -108,7 +108,7 @@ proc test5 {} {
 		[simple_principal "%s/a"] {0x100001} "%s/a"
     } $test $test] "BAD_MASK"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"    
@@ -124,7 +124,7 @@ proc test6 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -132,7 +132,7 @@ proc test6 {} {
 		{OVSEC_KADM_LAST_PWD_CHANGE} "%s/a"
     } $test $test] "BAD_MASK"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -148,7 +148,7 @@ proc test7 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -156,7 +156,7 @@ proc test7 {} {
 		{OVSEC_KADM_MOD_TIME} "%s/a"
     } $test $test] "BAD_MASK"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -172,7 +172,7 @@ proc test8 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -180,7 +180,7 @@ proc test8 {} {
 		{OVSEC_KADM_MOD_NAME} "%s/a"
     } $test $test] "BAD_MASK"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -196,7 +196,7 @@ proc test9 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -204,7 +204,7 @@ proc test9 {} {
 		{OVSEC_KADM_MKVNO} "%s/a"
     } $test $test] "BAD_MASK"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -220,7 +220,7 @@ proc test10 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -228,7 +228,7 @@ proc test10 {} {
 		{OVSEC_KADM_AUX_ATTRIBUTES} "%s/a"
     } $test $test] "BAD_MASK"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -244,7 +244,7 @@ proc test11 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -252,7 +252,7 @@ proc test11 {} {
 		{OVSEC_KADM_POLICY_CLR} "%s/a"
     } $test $test] "BAD_MASK"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -268,7 +268,7 @@ proc test12 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -276,7 +276,7 @@ proc test12 {} {
 		{OVSEC_KADM_PRINCIPAL} testpass
     } $test] "AUTH_ADD"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -298,7 +298,7 @@ proc test13 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -306,7 +306,7 @@ proc test13 {} {
 		{OVSEC_KADM_PRINCIPAL} testpass
     } $test] "AUTH_ADD"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"    
@@ -327,7 +327,7 @@ proc test14 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -335,7 +335,7 @@ proc test14 {} {
 		{OVSEC_KADM_PRINCIPAL} testpass
     } $test] "AUTH_ADD"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"    
@@ -356,7 +356,7 @@ proc test15 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -364,7 +364,7 @@ proc test15 {} {
 		{OVSEC_KADM_PRINCIPAL} testpass
     } $test] "AUTH_ADD"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"    
@@ -380,7 +380,7 @@ proc test16 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -388,7 +388,7 @@ proc test16 {} {
 		{OVSEC_KADM_PRINCIPAL} testpass
     } $test] "AUTH_ADD"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -409,7 +409,7 @@ proc test17 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -417,7 +417,7 @@ proc test17 {} {
 		{OVSEC_KADM_PRINCIPAL} testpass
     } $test] "DUP"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -439,7 +439,7 @@ proc test18 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -448,7 +448,7 @@ proc test18 {} {
 		{OVSEC_KADM_PRINCIPAL OVSEC_KADM_POLICY} tP
     } $test] "_Q_TOOSHORT"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"    
@@ -470,7 +470,7 @@ proc test19 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -479,7 +479,7 @@ proc test19 {} {
 		{OVSEC_KADM_PRINCIPAL OVSEC_KADM_POLICY} testpassword
     } $test] "_Q_CLASS"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -501,7 +501,7 @@ proc test20 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -510,7 +510,7 @@ proc test20 {} {
 		{OVSEC_KADM_PRINCIPAL OVSEC_KADM_POLICY} Abyssinia
     } $test] "_Q_DICT"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -532,7 +532,7 @@ proc test21 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -541,7 +541,7 @@ proc test21 {} {
 		{OVSEC_KADM_PRINCIPAL OVSEC_KADM_POLICY} NotinTheDictionary
     } $test] "UNK_POLICY"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -562,7 +562,7 @@ proc test23 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -575,7 +575,7 @@ proc test23 {} {
     one_line_succeed_test \
 	    [format {ovsec_kadm_get_principal $server_handle "%s/a" p} $test]
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -594,7 +594,7 @@ proc test24 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -607,7 +607,7 @@ proc test24 {} {
     one_line_succeed_test \
 	    [format {ovsec_kadm_get_principal $server_handle "%s/a" p} $test]
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -629,7 +629,7 @@ proc test28 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     
@@ -653,7 +653,7 @@ proc test28 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -674,7 +674,7 @@ proc test29 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -697,7 +697,7 @@ proc test29 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -718,7 +718,7 @@ proc test30 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -741,7 +741,7 @@ proc test30 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -762,7 +762,7 @@ proc test31 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -786,7 +786,7 @@ proc test31 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -807,7 +807,7 @@ proc test32 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -876,7 +876,7 @@ proc test32 {} {
     }
 
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+perror"$test: unexpected failure in destroy"
 	return
     }
 }
@@ -897,7 +897,7 @@ proc test33 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+perror"$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -921,7 +921,7 @@ proc test33 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -942,7 +942,7 @@ proc test34 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -966,7 +966,7 @@ proc test34 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -987,7 +987,7 @@ proc test35 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1011,7 +1011,7 @@ proc test35 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1032,7 +1032,7 @@ proc test36 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1101,7 +1101,7 @@ proc test36 {} {
     }
 
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+perror"$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1122,7 +1122,7 @@ proc test37 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1144,7 +1144,7 @@ proc test37 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1165,7 +1165,7 @@ proc test38 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1188,7 +1188,7 @@ proc test38 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1209,7 +1209,7 @@ proc test39 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1273,7 +1273,7 @@ proc test39 {} {
 	return
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+perror"$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1294,7 +1294,7 @@ proc test40 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+perror"$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1317,7 +1317,7 @@ proc test40 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.0/destroy.exp b/src/lib/kadm5/unit-test/api.0/destroy.exp
index a8572518d5..0f103991ec 100644
--- a/src/lib/kadm5/unit-test/api.0/destroy.exp
+++ b/src/lib/kadm5/unit-test/api.0/destroy.exp
@@ -12,7 +12,7 @@ proc test1 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
 	}]} {
-		error "$test: unexpected failure in init"
+		perror "$test: unexpected failure in init"
 		return
 	}
 	one_line_succeed_test {ovsec_kadm_destroy $server_handle}
@@ -30,7 +30,7 @@ test1
 #		    $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 #		    server_handle
 #	}]} {
-#	    error "$test: unexpected failure on init"
+#	    perror "$test: unexpected failure on init"
 #	    return
 #	}
 #	if {! [cmd {ovsec_kadm_destroy $server_handle}]} {
@@ -58,7 +58,7 @@ test1
 #		    $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 #		    server_handle
 #	}]} {
-#	    error "$test: unexpected failure on init"
+#	    perror "$test: unexpected failure on init"
 #	    return
 #	}
 #	if {! [cmd {ovsec_kadm_destroy $server_handle}]} {
@@ -120,7 +120,7 @@ test1
 #		    $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 #		    server_handle
 #	}]} {
-#	    error "$test: unexpected failure on init"
+#	    perror "$test: unexpected failure on init"
 #	    return
 #	}
 #	if {! [cmd {ovsec_kadm_destroy $server_handle}]} {
@@ -155,7 +155,7 @@ test1
 #		    $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 #		    server_handle
 #	}]} {
-#		error "$test: unexpected failure in init"
+#		perror "$test: unexpected failure in init"
 #		return
 #	}
 #	if {! [cmd {ovsec_kadm_destroy $server_handle}]} {
@@ -175,7 +175,7 @@ proc test8 {} {
 		    $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		    server_handle
 	}]} {
-		error "$test: unexpected failure in init"
+		perror "$test: unexpected failure in init"
 		return
 	}
 	if {! [cmd {ovsec_kadm_destroy $server_handle}]} {
diff --git a/src/lib/kadm5/unit-test/api.0/dlte-policy.exp b/src/lib/kadm5/unit-test/api.0/dlte-policy.exp
index 28ab827d39..cd82738e69 100644
--- a/src/lib/kadm5/unit-test/api.0/dlte-policy.exp
+++ b/src/lib/kadm5/unit-test/api.0/dlte-policy.exp
@@ -13,13 +13,13 @@ proc test2 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test \
 	    {ovsec_kadm_delete_policy $server_handle ""} "BAD_POL"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -39,14 +39,14 @@ proc test5 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_delete_policy $server_handle "%s/a"
     } $test] "AUTH_DELETE"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -66,14 +66,14 @@ proc test6 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_delete_policy $server_handle "%s/a"
     } $test] "AUTH_DELETE"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -93,14 +93,14 @@ proc test7 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_delete_policy $server_handle "%s/a"
     } $test] "AUTH_DELETE"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -120,7 +120,7 @@ proc test10 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -130,7 +130,7 @@ proc test10 {} {
 	return
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     if { [policy_exists "$test/a"]} {
@@ -158,7 +158,7 @@ proc test12 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test unexecpted failure in init"
+	perror "$test unexecpted failure in init"
 	return
     }
     if {! [cmd [format {
@@ -170,7 +170,7 @@ proc test12 {} {
 	return;
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     if {! [cmd {
@@ -178,13 +178,13 @@ proc test12 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test \
 	    {ovsec_kadm_delete_policy $server_handle test-pol} "POLICY_REF"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.0/dlte-principal.exp b/src/lib/kadm5/unit-test/api.0/dlte-principal.exp
index 255252eac5..5c617fb352 100644
--- a/src/lib/kadm5/unit-test/api.0/dlte-principal.exp
+++ b/src/lib/kadm5/unit-test/api.0/dlte-principal.exp
@@ -26,7 +26,7 @@ proc test2 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test \
@@ -52,14 +52,14 @@ proc test5 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_delete_principal $server_handle "%s/a"
     } $test] "UNK_PRINC"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -79,14 +79,14 @@ proc test6 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_delete_principal $server_handle "%s/a"
     } $test] "AUTH_DELETE"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -107,14 +107,14 @@ proc test7 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_delete_principal $server_handle "%s/a"
     } $test] "AUTH_DELETE"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -135,14 +135,14 @@ proc test8 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_delete_principal $server_handle "%s/a"
     } $test] "AUTH_DELETE"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -162,14 +162,14 @@ proc test9 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_delete_principal $server_handle "%s/a"
     } $test] "AUTH_DELETE"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -189,14 +189,14 @@ proc test10 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_delete_principal $server_handle "%s/a"
     } $test] "AUTH_DELETE"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -216,7 +216,7 @@ proc test11 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -226,7 +226,7 @@ proc test11 {} {
 	return;
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     if { [principal_exists "$test/a"] } {
@@ -251,11 +251,11 @@ proc test12 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd {ovsec_kadm_get_policy $server_handle test-pol p1}]}  {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     if { ! [cmd [format {
@@ -271,7 +271,7 @@ proc test12 {} {
 	return
     }
     if { ! [cmd {ovsec_kadm_get_policy $server_handle test-pol p2}]} {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     send "lindex \$p1 6\n"
@@ -305,7 +305,7 @@ proc test12 {} {
     }
     pass "$test"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.0/get-policy.exp b/src/lib/kadm5/unit-test/api.0/get-policy.exp
index 813bf3899f..7b01814124 100644
--- a/src/lib/kadm5/unit-test/api.0/get-policy.exp
+++ b/src/lib/kadm5/unit-test/api.0/get-policy.exp
@@ -13,12 +13,12 @@ proc test3 {} {
 	    $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 	server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {ovsec_kadm_get_policy $server_handle "" p} "BAD_POLICY"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -33,13 +33,13 @@ proc test6 {} {
 	    $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 	    server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {ovsec_kadm_get_policy $server_handle test-pol p} \
 	    "AUTH_GET"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -54,13 +54,13 @@ proc test7 {} {
 	    $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 	    server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {ovsec_kadm_get_policy $server_handle test-pol p} \
 	    "AUTH_GET"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -75,12 +75,12 @@ proc test11 {} {
 		null $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test {ovsec_kadm_get_policy $server_handle test-pol p}
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -95,13 +95,13 @@ proc test12 {} {
 		$OVSEC_KADM_CHANGEPW_SERVICE null $OVSEC_KADM_STRUCT_VERSION \
 		$OVSEC_KADM_API_VERSION_1 server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test \
 	    {ovsec_kadm_get_policy $server_handle test-pol-nopw p}
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -116,13 +116,13 @@ proc test15 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test \
 	    {ovsec_kadm_get_policy $server_handle test-pol-nopw p}
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -137,13 +137,13 @@ proc test16 {} {
 		null $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test \
 	    {ovsec_kadm_get_policy $server_handle test-pol-nopw p}
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -158,12 +158,12 @@ proc test17 {} {
 	    $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 	    server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test {ovsec_kadm_get_policy $server_handle test-pol p}
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -178,13 +178,13 @@ proc test18 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {ovsec_kadm_get_policy $server_handle test-pol p} \
 	    "AUTH_GET"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.0/get-principal.exp b/src/lib/kadm5/unit-test/api.0/get-principal.exp
index 83c86b3fd4..cf055f7878 100644
--- a/src/lib/kadm5/unit-test/api.0/get-principal.exp
+++ b/src/lib/kadm5/unit-test/api.0/get-principal.exp
@@ -9,13 +9,13 @@ proc test1 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test \
 	    {ovsec_kadm_get_principal $server_handle null p} "EINVAL"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -35,14 +35,14 @@ proc test2 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_get_principal $server_handle "%s/a" p
     } $test] "UNK_PRINC"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -62,14 +62,14 @@ proc test3 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_get_principal $server_handle "%s/a" p
     } $test] "AUTH_GET"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -89,7 +89,7 @@ proc test4 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -97,7 +97,7 @@ proc test4 {} {
     } $test] "AUTH_GET"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
 
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -117,7 +117,7 @@ proc test5 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -125,7 +125,7 @@ proc test5 {} {
     } $test] "AUTH_GET"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
 
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -145,7 +145,7 @@ proc test6 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -153,7 +153,7 @@ proc test6 {} {
     } $test] "AUTH_GET"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
 
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -173,7 +173,7 @@ proc test7 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -181,7 +181,7 @@ proc test7 {} {
     } $test] "AUTH_GET"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
 
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -202,14 +202,14 @@ proc test8 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_get_principal $server_handle "%s/a" p
     } $test] "AUTH_GET"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -224,13 +224,13 @@ proc test9 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test \
 	    {ovsec_kadm_get_principal $server_handle admin/none p}
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -244,13 +244,13 @@ proc test10 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test \
 	    {ovsec_kadm_get_principal $server_handle admin/none p}
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -264,12 +264,12 @@ proc test11 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test {ovsec_kadm_get_principal $server_handle admin/get p}
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -283,12 +283,12 @@ proc test12 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test {ovsec_kadm_get_principal $server_handle admin/get p}
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -302,12 +302,12 @@ proc test13 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test {ovsec_kadm_get_principal $server_handle admin/add p}
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -321,12 +321,12 @@ proc test14 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test {ovsec_kadm_get_principal $server_handle admin/add p}
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.0/init.exp b/src/lib/kadm5/unit-test/api.0/init.exp
index ad9c512556..62b1bde357 100644
--- a/src/lib/kadm5/unit-test/api.0/init.exp
+++ b/src/lib/kadm5/unit-test/api.0/init.exp
@@ -687,7 +687,7 @@ proc test45_46 {service} {
     expect {
 	-re "Principal .* deleted." {}
 	default {
-	    error "kadmin.local delprinc failed\n";
+	    perror "kadmin.local delprinc failed\n";
 	}
     }
     expect eof
diff --git a/src/lib/kadm5/unit-test/api.0/mod-policy.exp b/src/lib/kadm5/unit-test/api.0/mod-policy.exp
index c0dd93e641..ec55999b71 100644
--- a/src/lib/kadm5/unit-test/api.0/mod-policy.exp
+++ b/src/lib/kadm5/unit-test/api.0/mod-policy.exp
@@ -17,7 +17,7 @@ proc test2 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -25,7 +25,7 @@ proc test2 {} {
 		{OVSEC_KADM_PW_MAX_LIFE}
     } $test] "AUTH_MODIFY"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -45,7 +45,7 @@ proc test4 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -53,7 +53,7 @@ proc test4 {} {
 		{OVSEC_KADM_REF_COUNT}
     } $test] "BAD_MASK"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-        error "$test: unexpected failure in destroy"
+        perror "$test: unexpected failure in destroy"
         return
     }
 }
@@ -76,7 +76,7 @@ proc test8 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {
@@ -84,7 +84,7 @@ proc test8 {} {
 		{OVSEC_KADM_PW_MAX_LIFE}
     } "BAD_POLICY"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -105,7 +105,7 @@ proc test9 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -128,7 +128,7 @@ proc test9 {} {
     }
     
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -148,7 +148,7 @@ proc test10 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -170,7 +170,7 @@ proc test10 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -193,7 +193,7 @@ proc test11 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -215,7 +215,7 @@ proc test11 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -237,7 +237,7 @@ proc test12 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -259,7 +259,7 @@ proc test12 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -279,7 +279,7 @@ proc test13 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -287,7 +287,7 @@ proc test13 {} {
 		{OVSEC_KADM_PW_MIN_LENGTH}
     } $test] "BAD_LENGTH"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -309,7 +309,7 @@ proc test14 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -331,7 +331,7 @@ proc test14 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -351,7 +351,7 @@ proc test15 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -359,7 +359,7 @@ proc test15 {} {
 		{OVSEC_KADM_PW_MIN_CLASSES}
     } $test] "BAD_CLASS"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -381,7 +381,7 @@ proc test16 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -405,7 +405,7 @@ proc test16 {} {
     
     
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -427,7 +427,7 @@ proc test17 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -450,7 +450,7 @@ proc test17 {} {
     }
     
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -472,7 +472,7 @@ proc test18 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -480,7 +480,7 @@ proc test18 {} {
 		{OVSEC_KADM_PW_MIN_CLASSES}
     } $test] "BAD_CLASS"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -501,7 +501,7 @@ proc test19 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -509,7 +509,7 @@ proc test19 {} {
 		{OVSEC_KADM_PW_HISTORY_NUM}
     } $test] "BAD_HISTORY"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -531,7 +531,7 @@ proc test20 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -554,7 +554,7 @@ proc test20 {} {
     }
     
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -576,7 +576,7 @@ proc test21 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -599,7 +599,7 @@ proc test21 {} {
     }
     
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -619,7 +619,7 @@ proc test22 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -627,7 +627,7 @@ proc test22 {} {
 		{OVSEC_KADM_PW_MAX_LIFE}
     } $test] "AUTH_MODIFY"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -647,7 +647,7 @@ proc test23 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -655,7 +655,7 @@ proc test23 {} {
 		{OVSEC_KADM_PW_MAX_LIFE}
     } $test] "AUTH_MODIFY"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -675,7 +675,7 @@ proc test26 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
@@ -683,7 +683,7 @@ proc test26 {} {
 		{OVSEC_KADM_PW_MAX_LIFE}
     } $test]
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.0/mod-principal.exp b/src/lib/kadm5/unit-test/api.0/mod-principal.exp
index f80dede0e9..d6a9cbc902 100644
--- a/src/lib/kadm5/unit-test/api.0/mod-principal.exp
+++ b/src/lib/kadm5/unit-test/api.0/mod-principal.exp
@@ -25,7 +25,7 @@ proc test2 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -33,7 +33,7 @@ proc test2 {} {
 		{OVSEC_KADM_PRINC_EXPIRE_TIME}
     } $test] "AUTH_MODIFY"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -52,7 +52,7 @@ proc test4 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -60,7 +60,7 @@ proc test4 {} {
 		{OVSEC_KADM_PRINCIPAL}
     } $test] "BAD_MASK"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -80,7 +80,7 @@ proc test5 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -88,7 +88,7 @@ proc test5 {} {
 		{OVSEC_KADM_LAST_PWD_CHANGE}
     } $test] "BAD_MASK"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -107,7 +107,7 @@ proc test6 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -115,7 +115,7 @@ proc test6 {} {
 		{OVSEC_KADM_MOD_TIME}
     } $test] "BAD_MASK"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -134,7 +134,7 @@ proc test7 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -142,7 +142,7 @@ proc test7 {} {
 		{OVSEC_KADM_MOD_NAME}
     } $test] "BAD_MASK"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -161,7 +161,7 @@ proc test8 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -169,7 +169,7 @@ proc test8 {} {
 		{OVSEC_KADM_MKVNO}
     } $test] "BAD_MASK"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -188,7 +188,7 @@ proc test9 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -196,7 +196,7 @@ proc test9 {} {
 		{OVSEC_KADM_AUX_ATTRIBUTES}
     } $test] "BAD_MASK"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -215,7 +215,7 @@ proc test10 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -223,7 +223,7 @@ proc test10 {} {
 		{OVSEC_KADM_PRINC_EXPIRE_TIME}
     } $test] "UNK_PRINC"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -242,7 +242,7 @@ proc test11 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -250,7 +250,7 @@ proc test11 {} {
 		{OVSEC_KADM_PRINC_EXPIRE_TIME}
     } $test] "AUTH_MOD"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -269,7 +269,7 @@ proc test12 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -277,7 +277,7 @@ proc test12 {} {
 		{OVSEC_KADM_PRINC_EXPIRE_TIME}
     } $test] "AUTH_MOD"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -296,7 +296,7 @@ proc test13 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -304,7 +304,7 @@ proc test13 {} {
 		{OVSEC_KADM_PRINC_EXPIRE_TIME}
     } $test] "AUTH_MOD"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -323,7 +323,7 @@ proc test14 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -331,7 +331,7 @@ proc test14 {} {
 		{OVSEC_KADM_PRINC_EXPIRE_TIME}
     } $test] "AUTH_MOD"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -350,7 +350,7 @@ proc test15 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
@@ -358,7 +358,7 @@ proc test15 {} {
 		{OVSEC_KADM_PRINC_EXPIRE_TIME}
     } $test]
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -377,7 +377,7 @@ proc test17 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -385,7 +385,7 @@ proc test17 {} {
 		no-policy] {OVSEC_KADM_POLICY}
     } $test] "UNK_POLICY"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -409,11 +409,11 @@ proc test18 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd {ovsec_kadm_get_policy $server_handle test-pol p1}]}  {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     if {! [cmd [format {
@@ -447,7 +447,7 @@ proc test18 {} {
 	}
     }
     if { ! [cmd {ovsec_kadm_get_policy $server_handle test-pol p2}]} {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     
@@ -468,7 +468,7 @@ proc test18 {} {
 	return;
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -492,11 +492,11 @@ proc test19 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd {ovsec_kadm_get_policy $server_handle test-pol p1}]}  {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     if {! [cmd [format {
@@ -530,7 +530,7 @@ proc test19 {} {
 	}
     }
     if { ! [cmd {ovsec_kadm_get_policy $server_handle test-pol p2}]} {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     
@@ -551,7 +551,7 @@ proc test19 {} {
 	return;
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -575,18 +575,18 @@ proc test20 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd {ovsec_kadm_get_policy $server_handle test-pol p1}]}  {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     if {! [cmd [format {
 	ovsec_kadm_modify_principal $server_handle [simple_principal "%s/a"] \
 		{OVSEC_KADM_POLICY_CLR}
     } $test]]} {
-	error "$test: modify failed"
+	perror "$test: modify failed"
 	return
     }
     if {! [cmd [format {
@@ -613,7 +613,7 @@ proc test20 {} {
 	}
     }
     if { ! [cmd {ovsec_kadm_get_policy $server_handle test-pol p2}]} {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     
@@ -634,7 +634,7 @@ proc test20 {} {
 	return;
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -658,15 +658,15 @@ proc test21 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd {ovsec_kadm_get_policy $server_handle test-pol old_p1}]}  {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     if { ! [cmd {ovsec_kadm_get_policy $server_handle test-pol-nopw old_p2}]} {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     if {! [cmd [format {
@@ -708,11 +708,11 @@ proc test21 {} {
     }
     
     if { ! [cmd {ovsec_kadm_get_policy $server_handle test-pol new_p1}]} {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     if { ! [cmd {ovsec_kadm_get_policy $server_handle test-pol-nopw new_p2}]} {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     
@@ -749,7 +749,7 @@ proc test21 {} {
 	return;
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -773,11 +773,11 @@ proc test21.5 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd {ovsec_kadm_get_policy $server_handle test-pol old_p1}]}  {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     if {! [cmd [format {
@@ -807,7 +807,7 @@ proc test21.5 {} {
     }
     
     if { ! [cmd {ovsec_kadm_get_policy $server_handle test-pol new_p1}]} {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     
@@ -830,7 +830,7 @@ proc test21.5 {} {
     }
 
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -850,7 +850,7 @@ proc test22 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -872,7 +872,7 @@ proc test22 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -892,7 +892,7 @@ proc test23 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -914,7 +914,7 @@ proc test23 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1002,7 +1002,7 @@ proc test24 {} {
 	pass "$test"
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} { 
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1023,7 +1023,7 @@ proc test25 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -1045,7 +1045,7 @@ proc test25 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1066,7 +1066,7 @@ proc test26 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -1088,7 +1088,7 @@ proc test26 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1109,7 +1109,7 @@ proc test27 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -1131,7 +1131,7 @@ proc test27 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1154,7 +1154,7 @@ proc test28 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -1217,7 +1217,7 @@ proc test28 {} {
     }
     pass "$test"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1234,7 +1234,7 @@ proc test29 {} {
 	    return
     }
     if { ! ([create_principal_pol "$test/a" test-pol])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     if {! [cmd {
@@ -1242,7 +1242,7 @@ proc test29 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -1264,7 +1264,7 @@ proc test29 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1281,7 +1281,7 @@ proc test30 {} {
 	    return
     }
     if {! ([create_principal_pol "$test/a" test-pol])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     if {! [cmd {
@@ -1289,7 +1289,7 @@ proc test30 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -1311,7 +1311,7 @@ proc test30 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1327,7 +1327,7 @@ proc test31 {} {
 	    return
     }
     if {! ([create_principal "$test/a"])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     if {! [cmd {
@@ -1335,7 +1335,7 @@ proc test31 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -1399,7 +1399,7 @@ proc test31 {} {
     }
 
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1415,7 +1415,7 @@ proc test32 {} {
 	return
     }
     if {! ([create_principal "$test/a"])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     if {! [cmd {
@@ -1423,7 +1423,7 @@ proc test32 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1446,7 +1446,7 @@ proc test32 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1462,7 +1462,7 @@ proc test33 {} {
 	    return
     }
     if {! ([create_principal "$test/a"])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     
@@ -1471,7 +1471,7 @@ proc test33 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1494,7 +1494,7 @@ proc test33 {} {
 	timeout							{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1510,7 +1510,7 @@ proc test3325 {} {
 	    return
     }
     if {! ([create_principal "$test/a"])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     
@@ -1519,7 +1519,7 @@ proc test3325 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1542,7 +1542,7 @@ proc test3325 {} {
 	timeout							{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1558,7 +1558,7 @@ proc test335 {} {
 	    return
     }
     if {! ([create_principal "$test/a"])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     
@@ -1567,7 +1567,7 @@ proc test335 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1590,7 +1590,7 @@ proc test335 {} {
 	timeout							{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1607,7 +1607,7 @@ proc test34 {} {
 	    return
     }
     if {! ([create_principal "$test/a"])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
 
@@ -1616,7 +1616,7 @@ proc test34 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -1639,7 +1639,7 @@ proc test34 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1655,7 +1655,7 @@ proc test35 {} {
 	    return
     }
     if {! ([create_principal "$test/a"])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     if {! [cmd {
@@ -1663,7 +1663,7 @@ proc test35 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -1685,7 +1685,7 @@ proc test35 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1709,11 +1709,11 @@ proc test36 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd {ovsec_kadm_get_policy $server_handle test-pol pol}]}  {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     if {! [cmd [format {
@@ -1747,7 +1747,7 @@ proc test36 {} {
 	}
     }
     if { ! [cmd {ovsec_kadm_get_policy $server_handle test-pol pol2}]} {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     send "lindex \$pol2 6\n"
@@ -1767,7 +1767,7 @@ proc test36 {} {
 	return;
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1791,7 +1791,7 @@ proc test37 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1802,7 +1802,7 @@ proc test37 {} {
 	return
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1818,7 +1818,7 @@ proc test38 {} {
 	    return
     }
     if {! ([create_principal "$test/a"])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     if {! [cmd {
@@ -1826,7 +1826,7 @@ proc test38 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1848,7 +1848,7 @@ proc test38 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1864,7 +1864,7 @@ proc test39 {} {
 	    return
     }
     if {! ([create_principal "$test/a"])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     if {! [cmd {
@@ -1872,7 +1872,7 @@ proc test39 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1894,7 +1894,7 @@ proc test39 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1915,7 +1915,7 @@ proc test40 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {
@@ -1923,7 +1923,7 @@ proc test40 {} {
 		{OVSEC_KADM_PRINC_EXPIRE_TIME}
     } "EINVAL"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.0/randkey-principal.exp b/src/lib/kadm5/unit-test/api.0/randkey-principal.exp
index 1a10ad5783..c96700194a 100644
--- a/src/lib/kadm5/unit-test/api.0/randkey-principal.exp
+++ b/src/lib/kadm5/unit-test/api.0/randkey-principal.exp
@@ -20,14 +20,14 @@ proc test1 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     } $test $test]]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_randkey_principal $server_handle "%s/a" key
     } $test] "PASS_TOOSOON"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -51,14 +51,14 @@ proc test3 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     } $test $test]]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_randkey_principal $server_handle "%s/a" key
     } $test] "PASS_TOOSOON"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -77,21 +77,21 @@ proc test13 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
 	ovsec_kadm_modify_principal $server_handle [princ_w_pol "%s/a" \
 		once-a-min] OVSEC_KADM_POLICY
     } $test]]} {
-	error "$test: failed modify"
+	perror "$test: failed modify"
 	return
     }
     one_line_succeed_test [format {
 	ovsec_kadm_randkey_principal $server_handle "%s/a" key
     } $test]
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -115,14 +115,14 @@ proc test15 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_randkey_principal $server_handle "%s/a" key
     } $test] "AUTH_CHANGEPW"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -141,14 +141,14 @@ proc test28 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
 	ovsec_kadm_randkey_principal $server_handle "%s/a" key
     } $test]
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -167,14 +167,14 @@ proc test2825 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_randkey_principal $server_handle "%s/a" key
     } $test] "AUTH"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -193,14 +193,14 @@ proc test285 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
 	ovsec_kadm_randkey_principal $server_handle "%s/a" key
     } $test]
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -223,14 +223,14 @@ proc test30 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     } $test $test]]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
 	ovsec_kadm_randkey_principal $server_handle "%s/a" key
     } $test]
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -254,14 +254,14 @@ proc test31 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     } $test $test]]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
 	ovsec_kadm_randkey_principal $server_handle "%s/a" key
     } $test]
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -276,14 +276,14 @@ proc test32 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {
 	ovsec_kadm_randkey_principal $server_handle kadmin/history key
     } "PROTECT"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -302,14 +302,14 @@ proc test33 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_randkey_principal null "%s/a" key
     } $test] "BAD_SERVER_HANDLE"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.0/rename-principal.exp b/src/lib/kadm5/unit-test/api.0/rename-principal.exp
index c318249afb..d5f012f8b5 100644
--- a/src/lib/kadm5/unit-test/api.0/rename-principal.exp
+++ b/src/lib/kadm5/unit-test/api.0/rename-principal.exp
@@ -30,14 +30,14 @@ proc test2 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_rename_principal $server_handle "%s/a" "%s/b"
     } $test $test] "INSUFFICIENT"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 
@@ -63,14 +63,14 @@ proc test3 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_rename_principal $server_handle "%s/a" "%s/b"
     } $test $test] "AUTH_INSUFFICIENT"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -95,14 +95,14 @@ proc test4 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_rename_principal $server_handle "%s/a" "%s/b"
     } $test $test] "AUTH_INSUFFICIENT"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -127,14 +127,14 @@ proc test5 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_rename_principal $server_handle "%s/a" "%s/b"
     } $test $test] "AUTH_INSUFFICIENT"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -159,14 +159,14 @@ proc test6 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_rename_principal $server_handle "%s/a" "%s/b"
     } $test $test] "AUTH_DELETE"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -191,14 +191,14 @@ proc test7 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_rename_principal $server_handle "%s/a" "%s/b"
     } $test $test] "AUTH_ADD"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -223,14 +223,14 @@ proc test8 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_rename_principal $server_handle "%s/a" "%s/b"
     } $test $test] "AUTH_DELETE"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -255,14 +255,14 @@ proc test9 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_rename_principal $server_handle "%s/a" "%s/b"
     } $test $test] "AUTH_ADD"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -287,14 +287,14 @@ proc test10 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_rename_principal $server_handle "%s/a" "%s/b"
     } $test $test] "AUTH_DELETE"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -319,14 +319,14 @@ proc test11 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_rename_principal $server_handle "%s/a" "%s/b"
     } $test $test] "AUTH_ADD"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -351,14 +351,14 @@ proc test12 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_rename_principal $server_handle "%s/a" "%s/b"
     } $test $test] "AUTH"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -384,14 +384,14 @@ proc test13 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_rename_principal $server_handle "%s/a" "%s/b"
     } $test $test] "AUTH"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -419,14 +419,14 @@ proc test14 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
 	ovsec_kadm_rename_principal $server_handle "%s/a" "%s/b"
     } $test $test]
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -451,14 +451,14 @@ proc test15 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	ovsec_kadm_rename_principal $server_handle "%s/a" "%s/b"
     } $test $test] "DUP"
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -492,7 +492,7 @@ proc test18 {} {
 		$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -500,7 +500,7 @@ proc test18 {} {
     } $test $test] "NO_RENAME_SALT"
 
     if { ! [cmd {ovsec_kadm_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.1/lock.exp b/src/lib/kadm5/unit-test/api.1/lock.exp
index b6126ba978..e61a28f8d1 100644
--- a/src/lib/kadm5/unit-test/api.1/lock.exp
+++ b/src/lib/kadm5/unit-test/api.1/lock.exp
@@ -208,7 +208,7 @@ eval lock_test_continue $lock9
 eval lock_test_continue $lock9_1
 
 if {! [file exists $lockfile]} {
-    error "lock file missing before test 10"
+    perror "lock file missing before test 10"
 }
 set lock10 [lock_test_start 10 [list \
 	[list permanent	permanent] \
diff --git a/src/lib/kadm5/unit-test/api.2/chpass-principal-v2.exp b/src/lib/kadm5/unit-test/api.2/chpass-principal-v2.exp
index ef45510a23..d249af0d95 100644
--- a/src/lib/kadm5/unit-test/api.2/chpass-principal-v2.exp
+++ b/src/lib/kadm5/unit-test/api.2/chpass-principal-v2.exp
@@ -25,19 +25,19 @@ proc test200 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
 	kadm5_chpass_principal $server_handle "%s/a" newpassword
     } $test]]} {
-	error "$test: unexpected failure in chpass_principal"
+	perror "$test: unexpected failure in chpass_principal"
     }
     if {! [cmd [format {
 	kadm5_get_principal $server_handle  "%s/a" p \
 		{KADM5_PRINCIPAL_NORMAL_MASK KADM5_KEY_DATA}
     } $test]]} {
-	error "$test: unexpected failure in get_principal"
+	perror "$test: unexpected failure in get_principal"
     }
     send "lindex \$p 16\n"
     expect {
@@ -59,7 +59,7 @@ proc test200 {} {
 	fail "$test: $num_keys keys, should be 3"
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.2/chpass-principal.exp b/src/lib/kadm5/unit-test/api.2/chpass-principal.exp
index c4ac30f6b1..0571df20c5 100644
--- a/src/lib/kadm5/unit-test/api.2/chpass-principal.exp
+++ b/src/lib/kadm5/unit-test/api.2/chpass-principal.exp
@@ -20,7 +20,7 @@ proc test180 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
@@ -28,7 +28,7 @@ proc test180 {} {
     } $test]
 
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -52,14 +52,14 @@ proc test1805 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
 	kadm5_chpass_principal $server_handle "%s/a" FoobarBax
     } $test]
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -81,14 +81,14 @@ proc test180625 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_chpass_principal $server_handle "%s/a" password
     } $test] "AUTH"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -112,14 +112,14 @@ proc test18075 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_chpass_principal $server_handle "%s/a" Foobar
     } $test] "AUTH_CHANGEPW"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -134,14 +134,14 @@ proc test182 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {
 	kadm5_chpass_principal $server_handle kadmin/history password
     } "PROTECT"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -160,14 +160,14 @@ proc test183 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_chpass_principal null "%s/a" password
     } $test] "BAD_SERVER_HANDLE"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.2/crte-policy.exp b/src/lib/kadm5/unit-test/api.2/crte-policy.exp
index 273af3fa6e..f11253c2c3 100644
--- a/src/lib/kadm5/unit-test/api.2/crte-policy.exp
+++ b/src/lib/kadm5/unit-test/api.2/crte-policy.exp
@@ -17,7 +17,7 @@ proc test1 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -25,7 +25,7 @@ proc test1 {} {
 		0xF01000
     } $test] "BAD_MASK"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-        error "$test: unexpected failure in destroy"
+        perror "$test: unexpected failure in destroy"
         return
     }
 }
@@ -45,7 +45,7 @@ proc test2 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -53,7 +53,7 @@ proc test2 {} {
 		{KADM5_POLICY}
     } $test] "AUTH_ADD"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy";
+	perror "$test: unexpected failure in destroy";
 	return
     }
 }
@@ -74,7 +74,7 @@ proc test3 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -82,7 +82,7 @@ proc test3 {} {
 		0x000000
     } $test] "BAD_MASK"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-        error "$test: unexpected failure in destroy"
+        perror "$test: unexpected failure in destroy"
         return
     }
 }
@@ -103,7 +103,7 @@ proc test4 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -111,7 +111,7 @@ proc test4 {} {
 		{KADM5_POLICY KADM5_REF_COUNT}
     } $test] "BAD_MASK"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-        error "$test: unexpected failure in destroy"
+        perror "$test: unexpected failure in destroy"
         return
     }
 }
@@ -127,7 +127,7 @@ proc test5 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -135,7 +135,7 @@ proc test5 {} {
 		{KADM5_POLICY}
     } $test] "BAD_POLICY"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-        error "$test: unexpected failure in destroy"
+        perror "$test: unexpected failure in destroy"
         return
     }
 }
@@ -153,7 +153,7 @@ proc test6 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {
@@ -161,7 +161,7 @@ proc test6 {} {
 		{KADM5_POLICY}
     } "DUP"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -180,7 +180,7 @@ proc test7 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {
@@ -188,7 +188,7 @@ proc test7 {} {
 		{KADM5_POLICY}
     } "EINVAL"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-        error "$test: unexpected failure in destroy"
+        perror "$test: unexpected failure in destroy"
         return
     }
 }
@@ -204,7 +204,7 @@ proc test8 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {
@@ -212,7 +212,7 @@ proc test8 {} {
 		{KADM5_POLICY}
     } "BAD_POLICY"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -235,7 +235,7 @@ proc test9 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -257,7 +257,7 @@ proc test9 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -280,7 +280,7 @@ proc test10 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -302,7 +302,7 @@ proc test10 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -325,7 +325,7 @@ proc test11 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -348,7 +348,7 @@ proc test11 {} {
     }
     
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -371,7 +371,7 @@ proc test12 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -393,7 +393,7 @@ proc test12 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -416,7 +416,7 @@ proc test13 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -424,7 +424,7 @@ proc test13 {} {
 		{KADM5_POLICY KADM5_PW_MIN_LENGTH}
     } $test] "BAD_LENGTH"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -447,7 +447,7 @@ proc test14 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -470,7 +470,7 @@ proc test14 {} {
     }
     
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -492,7 +492,7 @@ proc test15 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -500,7 +500,7 @@ proc test15 {} {
 		{KADM5_POLICY KADM5_PW_MIN_CLASSES}
     } $test] "BAD_CLASS"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -523,7 +523,7 @@ proc test16 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -546,7 +546,7 @@ proc test16 {} {
     }
     
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -568,7 +568,7 @@ proc test17 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -590,7 +590,7 @@ proc test17 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -611,7 +611,7 @@ proc test18 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -619,7 +619,7 @@ proc test18 {} {
 		{KADM5_POLICY KADM5_PW_MIN_CLASSES}
     } $test] "BAD_CLASS"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -640,7 +640,7 @@ proc test19 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -648,7 +648,7 @@ proc test19 {} {
 		{KADM5_POLICY KADM5_PW_HISTORY_NUM}
     } $test] "BAD_HISTORY"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -670,7 +670,7 @@ proc test20 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd  [format {
@@ -692,7 +692,7 @@ proc test20 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -715,7 +715,7 @@ proc test21 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -737,7 +737,7 @@ proc test21 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -762,7 +762,7 @@ proc test215 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
 
@@ -771,7 +771,7 @@ proc test215 {} {
 		{KADM5_POLICY KADM5_PW_HISTORY_NUM}
     } $test] "BAD_HISTORY"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -793,7 +793,7 @@ proc test22 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -801,7 +801,7 @@ proc test22 {} {
 		{KADM5_POLICY}
     } $test] "AUTH_ADD"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -822,7 +822,7 @@ proc test23 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -830,7 +830,7 @@ proc test23 {} {
 		{KADM5_POLICY}
     } $test] "AUTH_ADD"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -852,7 +852,7 @@ proc test24 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -860,7 +860,7 @@ proc test24 {} {
 		{KADM5_POLICY}
     } $test] "AUTH_ADD"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -882,7 +882,7 @@ proc test25 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -890,7 +890,7 @@ proc test25 {} {
 		{KADM5_POLICY}
     } $test] "AUTH_ADD"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -911,7 +911,7 @@ proc test26 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
@@ -919,7 +919,7 @@ proc test26 {} {
 		{KADM5_POLICY}
     } $test]
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -941,7 +941,7 @@ proc test27 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
@@ -949,7 +949,7 @@ proc test27 {} {
 		{KADM5_POLICY}
     } $test]
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -965,14 +965,14 @@ proc test28 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {
 	kadm5_create_policy $server_handle null {KADM5_POLICY}
     } "EINVAL"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-        error "$test: unexpected failure in destroy"
+        perror "$test: unexpected failure in destroy"
         return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.2/crte-principal.exp b/src/lib/kadm5/unit-test/api.2/crte-principal.exp
index 85b2da2c4c..8a84af2710 100644
--- a/src/lib/kadm5/unit-test/api.2/crte-principal.exp
+++ b/src/lib/kadm5/unit-test/api.2/crte-principal.exp
@@ -25,7 +25,7 @@ proc test2 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {
@@ -33,7 +33,7 @@ proc test2 {} {
 		{KADM5_PRINCIPAL} testpass
     } "EINVAL"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"
@@ -51,7 +51,7 @@ proc test3 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -59,7 +59,7 @@ proc test3 {} {
 		{KADM5_PRINCIPAL} null
     } $test] "EINVAL"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"    
@@ -76,7 +76,7 @@ proc test4 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -84,7 +84,7 @@ proc test4 {} {
 		{KADM5_PRINCIPAL} ""
     } $test] "_Q_TOOSHORT"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"     
@@ -100,7 +100,7 @@ proc test5 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -108,7 +108,7 @@ proc test5 {} {
 		[simple_principal "%s/a"] {0x100001} "%s/a"
     } $test $test] "BAD_MASK"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"    
@@ -124,7 +124,7 @@ proc test6 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -132,7 +132,7 @@ proc test6 {} {
 		{KADM5_LAST_PWD_CHANGE} "%s/a"
     } $test $test] "BAD_MASK"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -148,7 +148,7 @@ proc test7 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -156,7 +156,7 @@ proc test7 {} {
 		{KADM5_MOD_TIME} "%s/a"
     } $test $test] "BAD_MASK"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -172,7 +172,7 @@ proc test8 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -180,7 +180,7 @@ proc test8 {} {
 		{KADM5_MOD_NAME} "%s/a"
     } $test $test] "BAD_MASK"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -196,7 +196,7 @@ proc test9 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -204,7 +204,7 @@ proc test9 {} {
 		{KADM5_MKVNO} "%s/a"
     } $test $test] "BAD_MASK"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -220,7 +220,7 @@ proc test10 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -228,7 +228,7 @@ proc test10 {} {
 		{KADM5_AUX_ATTRIBUTES} "%s/a"
     } $test $test] "BAD_MASK"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -244,7 +244,7 @@ proc test11 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -252,7 +252,7 @@ proc test11 {} {
 		{KADM5_POLICY_CLR} "%s/a"
     } $test $test] "BAD_MASK"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -268,7 +268,7 @@ proc test12 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -276,7 +276,7 @@ proc test12 {} {
 		{KADM5_PRINCIPAL} testpass
     } $test] "AUTH_ADD"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -298,7 +298,7 @@ proc test13 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -306,7 +306,7 @@ proc test13 {} {
 		{KADM5_PRINCIPAL} testpass
     } $test] "AUTH_ADD"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"    
@@ -327,7 +327,7 @@ proc test14 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -335,7 +335,7 @@ proc test14 {} {
 		{KADM5_PRINCIPAL} testpass
     } $test] "AUTH_ADD"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"    
@@ -356,7 +356,7 @@ proc test15 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -364,7 +364,7 @@ proc test15 {} {
 		{KADM5_PRINCIPAL} testpass
     } $test] "AUTH_ADD"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"    
@@ -380,7 +380,7 @@ proc test16 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -388,7 +388,7 @@ proc test16 {} {
 		{KADM5_PRINCIPAL} testpass
     } $test] "AUTH_ADD"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -409,7 +409,7 @@ proc test17 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -417,7 +417,7 @@ proc test17 {} {
 		{KADM5_PRINCIPAL} testpass
     } $test] "DUP"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -439,7 +439,7 @@ proc test18 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -448,7 +448,7 @@ proc test18 {} {
 		{KADM5_PRINCIPAL KADM5_POLICY} tP
     } $test] "_Q_TOOSHORT"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"    
@@ -470,7 +470,7 @@ proc test19 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -479,7 +479,7 @@ proc test19 {} {
 		{KADM5_PRINCIPAL KADM5_POLICY} testpassword
     } $test] "_Q_CLASS"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -501,7 +501,7 @@ proc test20 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -510,7 +510,7 @@ proc test20 {} {
 		{KADM5_PRINCIPAL KADM5_POLICY} Abyssinia
     } $test] "_Q_DICT"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -532,7 +532,7 @@ proc test21 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -541,7 +541,7 @@ proc test21 {} {
 		{KADM5_PRINCIPAL KADM5_POLICY} NotinTheDictionary
     } $test] "UNK_POLICY"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     end_dump_compare "no-diffs"        
@@ -562,7 +562,7 @@ proc test23 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -575,7 +575,7 @@ proc test23 {} {
     one_line_succeed_test \
 	    [format {kadm5_get_principal $server_handle "%s/a" p KADM5_PRINCIPAL_NORMAL_MASK} $test]
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -594,7 +594,7 @@ proc test24 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -607,7 +607,7 @@ proc test24 {} {
     one_line_succeed_test \
 	    [format {kadm5_get_principal $server_handle "%s/a" p KADM5_PRINCIPAL_NORMAL_MASK} $test]
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -629,7 +629,7 @@ proc test28 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     
@@ -653,7 +653,7 @@ proc test28 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -674,7 +674,7 @@ proc test29 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -697,7 +697,7 @@ proc test29 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -718,7 +718,7 @@ proc test30 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -741,7 +741,7 @@ proc test30 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -762,7 +762,7 @@ proc test31 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -786,7 +786,7 @@ proc test31 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -807,7 +807,7 @@ proc test32 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -875,7 +875,7 @@ proc test32 {} {
 	pass "$test"
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -896,7 +896,7 @@ proc test33 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -920,7 +920,7 @@ proc test33 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -941,7 +941,7 @@ proc test34 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -965,7 +965,7 @@ proc test34 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -986,7 +986,7 @@ proc test35 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1010,7 +1010,7 @@ proc test35 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1031,7 +1031,7 @@ proc test36 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1100,7 +1100,7 @@ proc test36 {} {
     }
 
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1121,7 +1121,7 @@ proc test37 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1143,7 +1143,7 @@ proc test37 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1164,7 +1164,7 @@ proc test38 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1187,7 +1187,7 @@ proc test38 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1208,7 +1208,7 @@ proc test39 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1272,7 +1272,7 @@ proc test39 {} {
 	return
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1293,7 +1293,7 @@ proc test40 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1316,7 +1316,7 @@ proc test40 {} {
 	timeout			    { fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.2/destroy.exp b/src/lib/kadm5/unit-test/api.2/destroy.exp
index 5de40ef03e..744cacd218 100644
--- a/src/lib/kadm5/unit-test/api.2/destroy.exp
+++ b/src/lib/kadm5/unit-test/api.2/destroy.exp
@@ -12,7 +12,7 @@ proc test1 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
 	}]} {
-		error "$test: unexpected failure in init"
+		perror "$test: unexpected failure in init"
 		return
 	}
 	one_line_succeed_test {kadm5_destroy $server_handle}
@@ -30,7 +30,7 @@ test1
 #		    $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 #		    server_handle
 #	}]} {
-#	    error "$test: unexpected failure on init"
+#	    perror "$test: unexpected failure on init"
 #	    return
 #	}
 #	if {! [cmd {kadm5_destroy $server_handle}]} {
@@ -58,7 +58,7 @@ test1
 #		    $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 #		    server_handle
 #	}]} {
-#	    error "$test: unexpected failure on init"
+#	    perror "$test: unexpected failure on init"
 #	    return
 #	}
 #	if {! [cmd {kadm5_destroy $server_handle}]} {
@@ -120,7 +120,7 @@ test1
 #		    $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 #		    server_handle
 #	}]} {
-#	    error "$test: unexpected failure on init"
+#	    perror "$test: unexpected failure on init"
 #	    return
 #	}
 #	if {! [cmd {kadm5_destroy $server_handle}]} {
@@ -155,7 +155,7 @@ test1
 #		    $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 #		    server_handle
 #	}]} {
-#		error "$test: unexpected failure in init"
+#		perror "$test: unexpected failure in init"
 #		return
 #	}
 #	if {! [cmd {kadm5_destroy $server_handle}]} {
@@ -175,7 +175,7 @@ proc test8 {} {
 		    $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		    server_handle
 	}]} {
-		error "$test: unexpected failure in init"
+		perror "$test: unexpected failure in init"
 		return
 	}
 	if {! [cmd {kadm5_destroy $server_handle}]} {
diff --git a/src/lib/kadm5/unit-test/api.2/dlte-policy.exp b/src/lib/kadm5/unit-test/api.2/dlte-policy.exp
index 8fdea0b046..c2a53182ad 100644
--- a/src/lib/kadm5/unit-test/api.2/dlte-policy.exp
+++ b/src/lib/kadm5/unit-test/api.2/dlte-policy.exp
@@ -13,13 +13,13 @@ proc test2 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test \
 	    {kadm5_delete_policy $server_handle ""} "BAD_POL"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -39,14 +39,14 @@ proc test5 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_delete_policy $server_handle "%s/a"
     } $test] "AUTH_DELETE"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -66,14 +66,14 @@ proc test6 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_delete_policy $server_handle "%s/a"
     } $test] "AUTH_DELETE"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -93,14 +93,14 @@ proc test7 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_delete_policy $server_handle "%s/a"
     } $test] "AUTH_DELETE"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -120,7 +120,7 @@ proc test10 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -130,7 +130,7 @@ proc test10 {} {
 	return
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     if { [policy_exists "$test/a"]} {
@@ -158,7 +158,7 @@ proc test12 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test unexecpted failure in init"
+	perror "$test unexecpted failure in init"
 	return
     }
     if {! [cmd [format {
@@ -170,7 +170,7 @@ proc test12 {} {
 	return;
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     if {! [cmd {
@@ -178,13 +178,13 @@ proc test12 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test \
 	    {kadm5_delete_policy $server_handle test-pol} "POLICY_REF"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.2/dlte-principal.exp b/src/lib/kadm5/unit-test/api.2/dlte-principal.exp
index 43a4238a40..f9dad78014 100644
--- a/src/lib/kadm5/unit-test/api.2/dlte-principal.exp
+++ b/src/lib/kadm5/unit-test/api.2/dlte-principal.exp
@@ -26,7 +26,7 @@ proc test2 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test \
@@ -52,14 +52,14 @@ proc test5 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_delete_principal $server_handle "%s/a"
     } $test] "UNK_PRINC"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -79,14 +79,14 @@ proc test6 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_delete_principal $server_handle "%s/a"
     } $test] "AUTH_DELETE"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -107,14 +107,14 @@ proc test7 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_delete_principal $server_handle "%s/a"
     } $test] "AUTH_DELETE"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -135,14 +135,14 @@ proc test8 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_delete_principal $server_handle "%s/a"
     } $test] "AUTH_DELETE"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -162,14 +162,14 @@ proc test9 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_delete_principal $server_handle "%s/a"
     } $test] "AUTH_DELETE"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -189,14 +189,14 @@ proc test10 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_delete_principal $server_handle "%s/a"
     } $test] "AUTH_DELETE"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -216,7 +216,7 @@ proc test11 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -226,7 +226,7 @@ proc test11 {} {
 	return;
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     if { [principal_exists "$test/a"] } {
@@ -251,11 +251,11 @@ proc test12 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd {kadm5_get_policy $server_handle test-pol p1}]}  {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     if { ! [cmd [format {
@@ -271,7 +271,7 @@ proc test12 {} {
 	return
     }
     if { ! [cmd {kadm5_get_policy $server_handle test-pol p2}]} {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     send "lindex \$p1 6\n"
@@ -305,7 +305,7 @@ proc test12 {} {
     }
     pass "$test"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.2/get-policy.exp b/src/lib/kadm5/unit-test/api.2/get-policy.exp
index 5afece9dc3..83aef80e8f 100644
--- a/src/lib/kadm5/unit-test/api.2/get-policy.exp
+++ b/src/lib/kadm5/unit-test/api.2/get-policy.exp
@@ -13,12 +13,12 @@ proc test3 {} {
 	    $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 	server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {kadm5_get_policy $server_handle "" p} "BAD_POLICY"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -33,13 +33,13 @@ proc test6 {} {
 	    $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 	    server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {kadm5_get_policy $server_handle test-pol p} \
 	    "AUTH_GET"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -54,13 +54,13 @@ proc test7 {} {
 	    $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 	    server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {kadm5_get_policy $server_handle test-pol p} \
 	    "AUTH_GET"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -75,12 +75,12 @@ proc test11 {} {
 		null $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test {kadm5_get_policy $server_handle test-pol p}
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -95,13 +95,13 @@ proc test12 {} {
 		$KADM5_CHANGEPW_SERVICE null $KADM5_STRUCT_VERSION \
 		$KADM5_API_VERSION_2 server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test \
 	    {kadm5_get_policy $server_handle test-pol-nopw p}
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -116,13 +116,13 @@ proc test15 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test \
 	    {kadm5_get_policy $server_handle test-pol-nopw p}
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -137,13 +137,13 @@ proc test16 {} {
 		null $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test \
 	    {kadm5_get_policy $server_handle test-pol-nopw p}
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -158,12 +158,12 @@ proc test17 {} {
 	    $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 	    server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test {kadm5_get_policy $server_handle test-pol p}
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -178,13 +178,13 @@ proc test18 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {kadm5_get_policy $server_handle test-pol p} \
 	    "AUTH_GET"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.2/get-principal-v2.exp b/src/lib/kadm5/unit-test/api.2/get-principal-v2.exp
index d2eb85a906..65c28b8089 100644
--- a/src/lib/kadm5/unit-test/api.2/get-principal-v2.exp
+++ b/src/lib/kadm5/unit-test/api.2/get-principal-v2.exp
@@ -11,14 +11,14 @@ proc test100 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd {
 	kadm5_get_principal $server_handle testuser p \
 		{KADM5_PRINCIPAL_NORMAL_MASK}
     }]} {
-	error "$test: unexpected failure in get_principal"
+	perror "$test: unexpected failure in get_principal"
     }
     send "lindex \$p 16\n"
     expect {
@@ -93,7 +93,7 @@ proc test100 {} {
     }
 
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -107,14 +107,14 @@ proc test101_102 {rpc} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd {
 	kadm5_get_principal $server_handle testuser p \
 		{KADM5_PRINCIPAL_NORMAL_MASK KADM5_KEY_DATA}
     }]} {
-	error "$test: unexpected failure in get_principal"
+	perror "$test: unexpected failure in get_principal"
     }
     send "lindex \$p 16\n"
     expect {
@@ -159,7 +159,7 @@ proc test101_102 {rpc} {
     if {$failed == 0} { pass "$test" }
     
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -183,7 +183,7 @@ proc test103 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
 
@@ -200,7 +200,7 @@ proc test103 {} {
 	kadm5_get_principal $server_handle {%s/a} p \
 		{KADM5_PRINCIPAL_NORMAL_MASK KADM5_TL_DATA}
     } $test]]} {
-	error "$test: unexpected failure in get_principal"
+	perror "$test: unexpected failure in get_principal"
     }
     send "lindex \$p 17\n"
     expect {
@@ -237,7 +237,7 @@ proc test103 {} {
     }
 
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.2/get-principal.exp b/src/lib/kadm5/unit-test/api.2/get-principal.exp
index 6d33910022..f7a73078d2 100644
--- a/src/lib/kadm5/unit-test/api.2/get-principal.exp
+++ b/src/lib/kadm5/unit-test/api.2/get-principal.exp
@@ -9,13 +9,13 @@ proc test1 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test \
 	    {kadm5_get_principal $server_handle null p KADM5_PRINCIPAL_NORMAL_MASK} "EINVAL"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -35,14 +35,14 @@ proc test2 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_get_principal $server_handle "%s/a" p KADM5_PRINCIPAL_NORMAL_MASK
     } $test] "UNK_PRINC"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -62,14 +62,14 @@ proc test3 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_get_principal $server_handle "%s/a" p KADM5_PRINCIPAL_NORMAL_MASK
     } $test] "AUTH_GET"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -89,7 +89,7 @@ proc test4 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -97,7 +97,7 @@ proc test4 {} {
     } $test] "AUTH_GET"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
 
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -117,7 +117,7 @@ proc test5 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -125,7 +125,7 @@ proc test5 {} {
     } $test] "AUTH_GET"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
 
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -145,7 +145,7 @@ proc test6 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -153,7 +153,7 @@ proc test6 {} {
     } $test] "AUTH_GET"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
 
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -173,7 +173,7 @@ proc test7 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -181,7 +181,7 @@ proc test7 {} {
     } $test] "AUTH_GET"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
 
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -202,14 +202,14 @@ proc test8 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_get_principal $server_handle "%s/a" p KADM5_PRINCIPAL_NORMAL_MASK
     } $test] "AUTH_GET"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -224,13 +224,13 @@ proc test9 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test \
 	    {kadm5_get_principal $server_handle admin/none p KADM5_PRINCIPAL_NORMAL_MASK} 
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -244,13 +244,13 @@ proc test10 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test \
 	    {kadm5_get_principal $server_handle admin/none p KADM5_PRINCIPAL_NORMAL_MASK}
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -264,12 +264,12 @@ proc test11 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test {kadm5_get_principal $server_handle admin/get p KADM5_PRINCIPAL_NORMAL_MASK}
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -283,12 +283,12 @@ proc test12 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test {kadm5_get_principal $server_handle admin/get p KADM5_PRINCIPAL_NORMAL_MASK}
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -302,12 +302,12 @@ proc test13 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test {kadm5_get_principal $server_handle admin/add p KADM5_PRINCIPAL_NORMAL_MASK} 
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -321,12 +321,12 @@ proc test14 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test {kadm5_get_principal $server_handle admin/add p KADM5_PRINCIPAL_NORMAL_MASK}
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.2/init-v2.exp b/src/lib/kadm5/unit-test/api.2/init-v2.exp
index 9f702ce927..11eac5b455 100644
--- a/src/lib/kadm5/unit-test/api.2/init-v2.exp
+++ b/src/lib/kadm5/unit-test/api.2/init-v2.exp
@@ -274,7 +274,7 @@ proc test109 {} {
 	}
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
     if {$max_life == 10} {
@@ -510,7 +510,7 @@ proc test117 {} {
 	kadm5_create_principal $server_handle [simple_principal "%s/a"] \
 		{KADM5_PRINCIPAL} "%s/a"
     } $test $test]]} {
-	error "$test: unexpected failure creating principal"
+	perror "$test: unexpected failure creating principal"
     }
     if {! [cmd [format {
 	kadm5_get_principal $server_handle "%s/a" principal KADM5_MAX_LIFE
diff --git a/src/lib/kadm5/unit-test/api.2/init.exp b/src/lib/kadm5/unit-test/api.2/init.exp
index 8471adddc5..a1a2bc5ea5 100644
--- a/src/lib/kadm5/unit-test/api.2/init.exp
+++ b/src/lib/kadm5/unit-test/api.2/init.exp
@@ -691,7 +691,7 @@ proc test45_46 {service} {
     expect {
 	-re "Principal .* deleted." {}
 	default {
-	    error "kadmin.local delprinc failed\n";
+	    perror "kadmin.local delprinc failed\n";
 	}
     }
     expect eof
diff --git a/src/lib/kadm5/unit-test/api.2/mod-policy.exp b/src/lib/kadm5/unit-test/api.2/mod-policy.exp
index 4ca0e3e853..2cc168648a 100644
--- a/src/lib/kadm5/unit-test/api.2/mod-policy.exp
+++ b/src/lib/kadm5/unit-test/api.2/mod-policy.exp
@@ -17,7 +17,7 @@ proc test2 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -25,7 +25,7 @@ proc test2 {} {
 		{KADM5_PW_MAX_LIFE}
     } $test] "AUTH_MODIFY"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -45,7 +45,7 @@ proc test4 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -53,7 +53,7 @@ proc test4 {} {
 		{KADM5_REF_COUNT}
     } $test] "BAD_MASK"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-        error "$test: unexpected failure in destroy"
+        perror "$test: unexpected failure in destroy"
         return
     }
 }
@@ -76,7 +76,7 @@ proc test8 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {
@@ -84,7 +84,7 @@ proc test8 {} {
 		{KADM5_PW_MAX_LIFE}
     } "BAD_POLICY"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -105,7 +105,7 @@ proc test9 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -128,7 +128,7 @@ proc test9 {} {
     }
     
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -148,7 +148,7 @@ proc test10 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -170,7 +170,7 @@ proc test10 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -193,7 +193,7 @@ proc test11 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -215,7 +215,7 @@ proc test11 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -237,7 +237,7 @@ proc test12 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -259,7 +259,7 @@ proc test12 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -279,7 +279,7 @@ proc test13 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -287,7 +287,7 @@ proc test13 {} {
 		{KADM5_PW_MIN_LENGTH}
     } $test] "BAD_LENGTH"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -309,7 +309,7 @@ proc test14 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -331,7 +331,7 @@ proc test14 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -351,7 +351,7 @@ proc test15 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -359,7 +359,7 @@ proc test15 {} {
 		{KADM5_PW_MIN_CLASSES}
     } $test] "BAD_CLASS"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -381,7 +381,7 @@ proc test16 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -405,7 +405,7 @@ proc test16 {} {
     
     
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -427,7 +427,7 @@ proc test17 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -450,7 +450,7 @@ proc test17 {} {
     }
     
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -472,7 +472,7 @@ proc test18 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -480,7 +480,7 @@ proc test18 {} {
 		{KADM5_PW_MIN_CLASSES}
     } $test] "BAD_CLASS"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -501,7 +501,7 @@ proc test19 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -509,7 +509,7 @@ proc test19 {} {
 		{KADM5_PW_HISTORY_NUM}
     } $test] "BAD_HISTORY"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -531,7 +531,7 @@ proc test20 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -554,7 +554,7 @@ proc test20 {} {
     }
     
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -576,7 +576,7 @@ proc test21 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -599,7 +599,7 @@ proc test21 {} {
     }
     
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -619,7 +619,7 @@ proc test22 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -627,7 +627,7 @@ proc test22 {} {
 		{KADM5_PW_MAX_LIFE}
     } $test] "AUTH_MODIFY"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -647,7 +647,7 @@ proc test23 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -655,7 +655,7 @@ proc test23 {} {
 		{KADM5_PW_MAX_LIFE}
     } $test] "AUTH_MODIFY"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -675,7 +675,7 @@ proc test26 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
@@ -683,7 +683,7 @@ proc test26 {} {
 		{KADM5_PW_MAX_LIFE}
     } $test]
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.2/mod-principal-v2.exp b/src/lib/kadm5/unit-test/api.2/mod-principal-v2.exp
index db8b6ffdbe..44c835e578 100644
--- a/src/lib/kadm5/unit-test/api.2/mod-principal-v2.exp
+++ b/src/lib/kadm5/unit-test/api.2/mod-principal-v2.exp
@@ -18,7 +18,7 @@ proc test100_104 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
 
@@ -107,7 +107,7 @@ proc test100_104 {} {
     }
 
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.2/mod-principal.exp b/src/lib/kadm5/unit-test/api.2/mod-principal.exp
index eebeb14259..4472c78cee 100644
--- a/src/lib/kadm5/unit-test/api.2/mod-principal.exp
+++ b/src/lib/kadm5/unit-test/api.2/mod-principal.exp
@@ -25,7 +25,7 @@ proc test2 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -33,7 +33,7 @@ proc test2 {} {
 		{KADM5_PRINC_EXPIRE_TIME}
     } $test] "AUTH_MODIFY"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -52,7 +52,7 @@ proc test4 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -60,7 +60,7 @@ proc test4 {} {
 		{KADM5_PRINCIPAL}
     } $test] "BAD_MASK"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -80,7 +80,7 @@ proc test5 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -88,7 +88,7 @@ proc test5 {} {
 		{KADM5_LAST_PWD_CHANGE}
     } $test] "BAD_MASK"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -107,7 +107,7 @@ proc test6 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -115,7 +115,7 @@ proc test6 {} {
 		{KADM5_MOD_TIME}
     } $test] "BAD_MASK"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -134,7 +134,7 @@ proc test7 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -142,7 +142,7 @@ proc test7 {} {
 		{KADM5_MOD_NAME}
     } $test] "BAD_MASK"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -161,7 +161,7 @@ proc test8 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -169,7 +169,7 @@ proc test8 {} {
 		{KADM5_MKVNO}
     } $test] "BAD_MASK"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -188,7 +188,7 @@ proc test9 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -196,7 +196,7 @@ proc test9 {} {
 		{KADM5_AUX_ATTRIBUTES}
     } $test] "BAD_MASK"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -215,7 +215,7 @@ proc test10 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -223,7 +223,7 @@ proc test10 {} {
 		{KADM5_PRINC_EXPIRE_TIME}
     } $test] "UNK_PRINC"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -242,7 +242,7 @@ proc test11 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -250,7 +250,7 @@ proc test11 {} {
 		{KADM5_PRINC_EXPIRE_TIME}
     } $test] "AUTH_MOD"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -269,7 +269,7 @@ proc test12 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -277,7 +277,7 @@ proc test12 {} {
 		{KADM5_PRINC_EXPIRE_TIME}
     } $test] "AUTH_MOD"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -296,7 +296,7 @@ proc test13 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -304,7 +304,7 @@ proc test13 {} {
 		{KADM5_PRINC_EXPIRE_TIME}
     } $test] "AUTH_MOD"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -323,7 +323,7 @@ proc test14 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -331,7 +331,7 @@ proc test14 {} {
 		{KADM5_PRINC_EXPIRE_TIME}
     } $test] "AUTH_MOD"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -350,7 +350,7 @@ proc test15 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
@@ -358,7 +358,7 @@ proc test15 {} {
 		{KADM5_PRINC_EXPIRE_TIME}
     } $test]
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -377,7 +377,7 @@ proc test17 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
@@ -385,7 +385,7 @@ proc test17 {} {
 		no-policy] {KADM5_POLICY}
     } $test] "UNK_POLICY"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -409,11 +409,11 @@ proc test18 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd {kadm5_get_policy $server_handle test-pol p1}]}  {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     if {! [cmd [format {
@@ -447,7 +447,7 @@ proc test18 {} {
 	}
     }
     if { ! [cmd {kadm5_get_policy $server_handle test-pol p2}]} {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     
@@ -468,7 +468,7 @@ proc test18 {} {
 	return;
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -492,11 +492,11 @@ proc test19 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd {kadm5_get_policy $server_handle test-pol p1}]}  {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     if {! [cmd [format {
@@ -530,7 +530,7 @@ proc test19 {} {
 	}
     }
     if { ! [cmd {kadm5_get_policy $server_handle test-pol p2}]} {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     
@@ -551,7 +551,7 @@ proc test19 {} {
 	return;
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -575,18 +575,18 @@ proc test20 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd {kadm5_get_policy $server_handle test-pol p1}]}  {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     if {! [cmd [format {
 	kadm5_modify_principal $server_handle [simple_principal "%s/a"] \
 		{KADM5_POLICY_CLR}
     } $test]]} {
-	error "$test: modify failed"
+	perror "$test: modify failed"
 	return
     }
     if {! [cmd [format {
@@ -613,7 +613,7 @@ proc test20 {} {
 	}
     }
     if { ! [cmd {kadm5_get_policy $server_handle test-pol p2}]} {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     
@@ -634,7 +634,7 @@ proc test20 {} {
 	return;
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -658,15 +658,15 @@ proc test21 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd {kadm5_get_policy $server_handle test-pol old_p1}]}  {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     if { ! [cmd {kadm5_get_policy $server_handle test-pol-nopw old_p2}]} {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     if {! [cmd [format {
@@ -708,11 +708,11 @@ proc test21 {} {
     }
     
     if { ! [cmd {kadm5_get_policy $server_handle test-pol new_p1}]} {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     if { ! [cmd {kadm5_get_policy $server_handle test-pol-nopw new_p2}]} {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     
@@ -749,7 +749,7 @@ proc test21 {} {
 	return;
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -773,11 +773,11 @@ proc test21.5 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd {kadm5_get_policy $server_handle test-pol old_p1}]}  {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     if {! [cmd [format {
@@ -807,7 +807,7 @@ proc test21.5 {} {
     }
     
     if { ! [cmd {kadm5_get_policy $server_handle test-pol new_p1}]} {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     
@@ -830,7 +830,7 @@ proc test21.5 {} {
     }
 
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -850,7 +850,7 @@ proc test22 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -872,7 +872,7 @@ proc test22 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -892,7 +892,7 @@ proc test23 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -914,7 +914,7 @@ proc test23 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1002,7 +1002,7 @@ proc test24 {} {
 	pass "$test"
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} { 
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1023,7 +1023,7 @@ proc test25 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -1045,7 +1045,7 @@ proc test25 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1066,7 +1066,7 @@ proc test26 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -1088,7 +1088,7 @@ proc test26 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1109,7 +1109,7 @@ proc test27 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -1131,7 +1131,7 @@ proc test27 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1154,7 +1154,7 @@ proc test28 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -1217,7 +1217,7 @@ proc test28 {} {
     }
     pass "$test"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1234,7 +1234,7 @@ proc test29 {} {
 	    return
     }
     if { ! ([create_principal_pol "$test/a" test-pol])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     if {! [cmd {
@@ -1242,7 +1242,7 @@ proc test29 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -1264,7 +1264,7 @@ proc test29 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1281,7 +1281,7 @@ proc test30 {} {
 	    return
     }
     if {! ([create_principal_pol "$test/a" test-pol])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     if {! [cmd {
@@ -1289,7 +1289,7 @@ proc test30 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -1311,7 +1311,7 @@ proc test30 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1327,7 +1327,7 @@ proc test31 {} {
 	    return
     }
     if {! ([create_principal "$test/a"])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     if {! [cmd {
@@ -1335,7 +1335,7 @@ proc test31 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -1399,7 +1399,7 @@ proc test31 {} {
     }
 
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1415,7 +1415,7 @@ proc test32 {} {
 	return
     }
     if {! ([create_principal "$test/a"])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     if {! [cmd {
@@ -1423,7 +1423,7 @@ proc test32 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1446,7 +1446,7 @@ proc test32 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1462,7 +1462,7 @@ proc test33 {} {
 	    return
     }
     if {! ([create_principal "$test/a"])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     
@@ -1471,7 +1471,7 @@ proc test33 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1494,7 +1494,7 @@ proc test33 {} {
 	timeout							{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1510,7 +1510,7 @@ proc test3325 {} {
 	    return
     }
     if {! ([create_principal "$test/a"])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     
@@ -1519,7 +1519,7 @@ proc test3325 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1542,7 +1542,7 @@ proc test3325 {} {
 	timeout							{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1558,7 +1558,7 @@ proc test335 {} {
 	    return
     }
     if {! ([create_principal "$test/a"])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     
@@ -1567,7 +1567,7 @@ proc test335 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1590,7 +1590,7 @@ proc test335 {} {
 	timeout							{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1607,7 +1607,7 @@ proc test34 {} {
 	    return
     }
     if {! ([create_principal "$test/a"])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
 
@@ -1616,7 +1616,7 @@ proc test34 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -1639,7 +1639,7 @@ proc test34 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1655,7 +1655,7 @@ proc test35 {} {
 	    return
     }
     if {! ([create_principal "$test/a"])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     if {! [cmd {
@@ -1663,7 +1663,7 @@ proc test35 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd [format {
@@ -1685,7 +1685,7 @@ proc test35 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1709,11 +1709,11 @@ proc test36 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if { ! [cmd {kadm5_get_policy $server_handle test-pol pol}]}  {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     if {! [cmd [format {
@@ -1747,7 +1747,7 @@ proc test36 {} {
 	}
     }
     if { ! [cmd {kadm5_get_policy $server_handle test-pol pol2}]} {
-	error "$test: unexpected failure on get policy"
+	perror "$test: unexpected failure on get policy"
 	return
     }
     send "lindex \$pol2 6\n"
@@ -1767,7 +1767,7 @@ proc test36 {} {
 	return;
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1791,7 +1791,7 @@ proc test37 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1802,7 +1802,7 @@ proc test37 {} {
 	return
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1818,7 +1818,7 @@ proc test38 {} {
 	    return
     }
     if {! ([create_principal "$test/a"])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     if {! [cmd {
@@ -1826,7 +1826,7 @@ proc test38 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1848,7 +1848,7 @@ proc test38 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1864,7 +1864,7 @@ proc test39 {} {
 	    return
     }
     if {! ([create_principal "$test/a"])} {
-	error "$test: unexpected failure in creating principal"
+	perror "$test: unexpected failure in creating principal"
 	return
     }
     if {! [cmd {
@@ -1872,7 +1872,7 @@ proc test39 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
@@ -1894,7 +1894,7 @@ proc test39 {} {
 	timeout				{ fail "$test" }
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -1915,7 +1915,7 @@ proc test40 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {
@@ -1923,7 +1923,7 @@ proc test40 {} {
 		{KADM5_PRINC_EXPIRE_TIME}
     } "EINVAL"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.2/randkey-principal-v2.exp b/src/lib/kadm5/unit-test/api.2/randkey-principal-v2.exp
index d9cc9718a1..c9d1104bc9 100644
--- a/src/lib/kadm5/unit-test/api.2/randkey-principal-v2.exp
+++ b/src/lib/kadm5/unit-test/api.2/randkey-principal-v2.exp
@@ -25,13 +25,13 @@ proc test100 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
 	kadm5_randkey_principal $server_handle "%s/a" keys num_keys
     } $test]]} {
-	error "$test: unexpected failure in randkey_principal"
+	perror "$test: unexpected failure in randkey_principal"
     }
     send "puts \$num_keys\n"
     expect {
@@ -53,7 +53,7 @@ proc test100 {} {
 	fail "$test: $num_keys keys, should be 2"
     }
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/api.2/randkey-principal.exp b/src/lib/kadm5/unit-test/api.2/randkey-principal.exp
index fb11c4801f..ecf79e4762 100644
--- a/src/lib/kadm5/unit-test/api.2/randkey-principal.exp
+++ b/src/lib/kadm5/unit-test/api.2/randkey-principal.exp
@@ -20,14 +20,14 @@ proc test1 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     } $test $test]]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_randkey_principal $server_handle "%s/a" keys num_keys
     } $test] "PASS_TOOSOON"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -51,14 +51,14 @@ proc test3 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     } $test $test]]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_randkey_principal $server_handle "%s/a" keys num_keys
     } $test] "PASS_TOOSOON"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -77,21 +77,21 @@ proc test13 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     if {! [cmd [format {
 	kadm5_modify_principal $server_handle [princ_w_pol "%s/a" \
 		once-a-min] KADM5_POLICY
     } $test]]} {
-	error "$test: failed modify"
+	perror "$test: failed modify"
 	return
     }
     one_line_succeed_test [format {
 	kadm5_randkey_principal $server_handle "%s/a" keys num_keys
     } $test]
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -115,14 +115,14 @@ proc test15 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_randkey_principal $server_handle "%s/a" keys num_keys
     } $test] "AUTH_CHANGEPW"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -141,14 +141,14 @@ proc test28 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
 	kadm5_randkey_principal $server_handle "%s/a" keys num_keys
     } $test]
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -167,14 +167,14 @@ proc test2825 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_randkey_principal $server_handle "%s/a" keys num_keys
     } $test] "AUTH"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -193,14 +193,14 @@ proc test285 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
 	kadm5_randkey_principal $server_handle "%s/a" keys num_keys
     } $test]
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -223,14 +223,14 @@ proc test30 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     } $test $test]]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
 	kadm5_randkey_principal $server_handle "%s/a" keys num_keys
     } $test]
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -254,14 +254,14 @@ proc test31 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     } $test $test]]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_succeed_test [format {
 	kadm5_randkey_principal $server_handle "%s/a" keys num_keys
     } $test]
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -276,14 +276,14 @@ proc test32 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test {
 	kadm5_randkey_principal $server_handle kadmin/history keys num_keys
     } "PROTECT"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
@@ -302,14 +302,14 @@ proc test33 {} {
 		$KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 \
 		server_handle
     }]} {
-	error "$test: unexpected failure in init"
+	perror "$test: unexpected failure in init"
 	return
     }
     one_line_fail_test [format {
 	kadm5_randkey_principal null "%s/a" keys num_keys
     } $test] "BAD_SERVER_HANDLE"
     if { ! [cmd {kadm5_destroy $server_handle}]} {
-	error "$test: unexpected failure in destroy"
+	perror "$test: unexpected failure in destroy"
 	return
     }
 }
diff --git a/src/lib/kadm5/unit-test/config/unix.exp b/src/lib/kadm5/unit-test/config/unix.exp
index 2aab9e407c..0472789ea1 100644
--- a/src/lib/kadm5/unit-test/config/unix.exp
+++ b/src/lib/kadm5/unit-test/config/unix.exp
@@ -58,6 +58,14 @@ proc api_start {} {
 	if {! [info exists env(TCLUTIL)]} {
 		error "TCLUTIL environment variable isn't set"
 	}
+	# tcl 8.4 for some reason screws up autodetection of output
+	# EOL translation.  Work around it for now.
+	send "if { \[info commands fconfigure\] ne \"\" } { fconfigure stdout -translation lf }\n"
+	expect {
+		-re "$prompt$" {}
+		eof { error "EOF starting API" }
+		timeout { error "Timeout starting API" }
+	}
 	send "source $env(TCLUTIL)\n"
 	expect {
 		-re "$prompt$" {}
diff --git a/src/lib/kadm5/unit-test/lib/lib.t b/src/lib/kadm5/unit-test/lib/lib.t
index ad3e22ceec..d1730d9a49 100644
--- a/src/lib/kadm5/unit-test/lib/lib.t
+++ b/src/lib/kadm5/unit-test/lib/lib.t
@@ -198,7 +198,7 @@ proc policy_exists {name} {
 proc error_and_restart {error} {
     api_exit
     api_start
-    error $error
+    perror $error
 }
 
 proc test {name} {