From 9fee361ec00a9e7f5c6304d45dad991d69f205c6 Mon Sep 17 00:00:00 2001
From: Andrew Engelbrecht <sudoman@ninthfloor.org>
Date: Mon, 3 Aug 2015 15:43:18 -0400
Subject: [PATCH] change name of test type

to avoid name collisions between tests
---
 run-tests | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/run-tests b/run-tests
index 179fb1c..30095eb 100755
--- a/run-tests
+++ b/run-tests
@@ -17,8 +17,7 @@
 # Copyright (C) 2015 Andrew Engelbrecht                     (AGPLv3+)    *
 #*************************************************************************
 
-NUM_TESTS=1
-#TEST_TYPES="gpg-flatten flatten plain"
+#TEST_TYPES="gpg-flatten flatten gpg-plain"
 TEST_TYPES="gpg-flatten flatten"
 
 function _main {
@@ -99,31 +98,32 @@ function _exec_gpg-flatten {
     echo "$ERROR"
 }
 
-function _exec_flatten {
+function _exec_gpg-plain {
 
     TEST_NAME="$1"
+    G_HOME="$2"
     TEST_EXEC_1="$3"
     TEST_EXEC_1_OPT="$4"
-    TEST_EXEC_2="$5"
     TEST_INPUT="$6"
     TEST_OUTPUT="$7"
 
-    PROGRAM_OUT="$(time "$TEST_EXEC_1" "$TEST_EXEC_1_OPT" < "$TEST_INPUT" | "$TEST_EXEC_2" )"
+    PROGRAM_OUT="$(time "$TEST_EXEC_1" "$TEST_EXEC_1_OPT" < "$TEST_INPUT" | GNUPGHOME="$G_HOME" gpg 2> /dev/null )"
 
     ERROR="$(_diff "$TEST_NAME" "$TEST_OUTPUT" "$PROGRAM_OUT")"
 
     echo "$ERROR"
 }
 
-function _exec_plain {
+function _exec_flatten {
 
     TEST_NAME="$1"
     TEST_EXEC_1="$3"
     TEST_EXEC_1_OPT="$4"
+    TEST_EXEC_2="$5"
     TEST_INPUT="$6"
     TEST_OUTPUT="$7"
 
-    PROGRAM_OUT="$(time "$TEST_EXEC_1" "$TEST_EXEC_1_OPT" < "$TEST_INPUT" )"
+    PROGRAM_OUT="$(time "$TEST_EXEC_1" "$TEST_EXEC_1_OPT" < "$TEST_INPUT" | "$TEST_EXEC_2" )"
 
     ERROR="$(_diff "$TEST_NAME" "$TEST_OUTPUT" "$PROGRAM_OUT")"
 
-- 
2.25.1