summaryrefslogtreecommitdiffstats
path: root/test/treq
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2015-04-08 12:28:15 -0400
committerRich Salz <rsalz@openssl.org>2015-04-08 12:28:15 -0400
commit5adac91eab78d0ba8b5c84e7c883ae123c28a72b (patch)
treee299386b15dfdcd4a9794ff33d5280a304505e67 /test/treq
parent37d92b1b2bb6e6e04d62d6f7774a2d8190a99174 (diff)
consistent test-start logging
Output a consistent "start" marker for each test. Remove "2>/dev/null" from Makefile command lines. Add OPENSSL_CONFIG=/dev/null for places where it's needed, in order to suppress a warning message from the openssl CLI. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'test/treq')
-rw-r--r--test/treq28
1 files changed, 1 insertions, 27 deletions
diff --git a/test/treq b/test/treq
index 420d25e168..82decceebe 100644
--- a/test/treq
+++ b/test/treq
@@ -1,6 +1,7 @@
#!/bin/sh
cmd='../util/shlib_wrap.sh ../apps/openssl req -config ../apps/openssl.cnf'
+OPENSSL_CONF=/dev/null ; export OPENSSL_CONF
if [ "$1"x != "x" ]; then
t=$1
@@ -19,9 +20,6 @@ cp $t req-fff.p
echo "p -> d"
$cmd -in req-fff.p -inform p -outform d >req-f.d
if [ $? != 0 ]; then exit 1; fi
-#echo "p -> t"
-#$cmd -in req-fff.p -inform p -outform t >req-f.t
-#if [ $? != 0 ]; then exit 1; fi
echo "p -> p"
$cmd -in req-fff.p -inform p -outform p >req-f.p
if [ $? != 0 ]; then exit 1; fi
@@ -29,29 +27,14 @@ if [ $? != 0 ]; then exit 1; fi
echo "d -> d"
$cmd -verify -in req-f.d -inform d -outform d >req-ff.d1
if [ $? != 0 ]; then exit 1; fi
-#echo "t -> d"
-#$cmd -in req-f.t -inform t -outform d >req-ff.d2
-#if [ $? != 0 ]; then exit 1; fi
echo "p -> d"
$cmd -verify -in req-f.p -inform p -outform d >req-ff.d3
if [ $? != 0 ]; then exit 1; fi
-#echo "d -> t"
-#$cmd -in req-f.d -inform d -outform t >req-ff.t1
-#if [ $? != 0 ]; then exit 1; fi
-#echo "t -> t"
-#$cmd -in req-f.t -inform t -outform t >req-ff.t2
-#if [ $? != 0 ]; then exit 1; fi
-#echo "p -> t"
-#$cmd -in req-f.p -inform p -outform t >req-ff.t3
-#if [ $? != 0 ]; then exit 1; fi
echo "d -> p"
$cmd -in req-f.d -inform d -outform p >req-ff.p1
if [ $? != 0 ]; then exit 1; fi
-#echo "t -> p"
-#$cmd -in req-f.t -inform t -outform p >req-ff.p2
-#if [ $? != 0 ]; then exit 1; fi
echo "p -> p"
$cmd -in req-f.p -inform p -outform p >req-ff.p3
if [ $? != 0 ]; then exit 1; fi
@@ -65,17 +48,8 @@ if [ $? != 0 ]; then exit 1; fi
cmp req-fff.p req-ff.p3
if [ $? != 0 ]; then exit 1; fi
-#cmp req-f.t req-ff.t1
-#if [ $? != 0 ]; then exit 1; fi
-#cmp req-f.t req-ff.t2
-#if [ $? != 0 ]; then exit 1; fi
-#cmp req-f.t req-ff.t3
-#if [ $? != 0 ]; then exit 1; fi
-
cmp req-f.p req-ff.p1
if [ $? != 0 ]; then exit 1; fi
-#cmp req-f.p req-ff.p2
-#if [ $? != 0 ]; then exit 1; fi
cmp req-f.p req-ff.p3
if [ $? != 0 ]; then exit 1; fi