From 908df4d0f7bda92ae9e73e24ce90d53f57a568c5 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Thu, 18 Nov 2010 22:44:48 +0000
Subject: [PATCH] We expect these scripts not to bail on error, so make sure
 that's what happens.

---
 test/testssl.com | 6 ++----
 test/testtsa.com | 4 ++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/test/testssl.com b/test/testssl.com
index 9c83afba04..88580291f1 100644
--- a/test/testssl.com
+++ b/test/testssl.com
@@ -21,10 +21,10 @@ $	    cert=p2
 $	endif
 $	ssltest := mcr 'texe_dir'ssltest -key 'key' -cert 'cert' -c_key 'key' -c_cert 'cert'
 $
+$	set noon
 $	define/user sys$output testssl-x509-output.
 $	define/user sys$error nla0:
 $	mcr 'exe_dir'openssl x509 -in 'cert' -text -noout
-$	set noon
 $	define/user sys$error nla0:
 $	search/output=nla0: testssl-x509-output. "DSA Public Key"/exact
 $	if $severity .eq. 1
@@ -33,7 +33,6 @@ $	    dsa_cert := YES
 $	else
 $	    dsa_cert := NO
 $	endif
-$	set on
 $	delete testssl-x509-output.;*
 $
 $	if p3 .eqs. ""
@@ -161,14 +160,12 @@ $	if $severity .ne. 1 then goto exit3
 $
 $!###########################################################################
 $
-$	set noon
 $	define/user sys$output nla0:
 $	mcr 'exe_dir'openssl no-rsa
 $	no_rsa=$SEVERITY
 $	define/user sys$output nla0:
 $	mcr 'exe_dir'openssl no-dh
 $	no_dh=$SEVERITY
-$	set on
 $
 $	if no_dh
 $	then
@@ -203,4 +200,5 @@ $ exit3:
 $	RET = 3
 $ exit:
 $	if p3 .eqs. "" then delete certs.tmp;*
+$	set on
 $	exit 'RET'
diff --git a/test/testtsa.com b/test/testtsa.com
index e3c586f14a..2ca1adac59 100644
--- a/test/testtsa.com
+++ b/test/testtsa.com
@@ -167,6 +167,8 @@ $	endsubroutine
 $
 $	! Main body ----------------------------------------------------------
 $
+$	set noon
+$
 $	write sys$output "Setting up TSA test directory..."
 $	call setup_dir
 $
@@ -245,4 +247,6 @@ $
 $	write sys$output "Cleaning up..."
 $	call clean_up_dir
 $
+$	set on
+$
 $	exit
-- 
2.25.1