From 1f1cd1ea5448a5b2503052ed7e0657e50a99a366 Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sun, 3 Feb 2013 11:33:10 -0500 Subject: [PATCH] Fixup tests for with and without gpg-agent use. --- tests/Makefile.am | 2 +- tests/convert-v2x-no-agent.test | 3 --- tests/convert-v2x-use-agent.test | 3 +++ tests/convert-v2x.test | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) delete mode 100755 tests/convert-v2x-no-agent.test create mode 100755 tests/convert-v2x-use-agent.test diff --git a/tests/Makefile.am b/tests/Makefile.am index 5a448900..c91751d4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -11,7 +11,7 @@ EXTRA_DIST= common.sh convert.result convert-v2x.test datafile.key \ rename.result4 realpath.test realpath.result2 realpath.result3 \ import.test import.result2 import.result3 import.result4 \ import.result5 xpath.result3 xpath.result4 xpath.test \ - convert-v2x-no-agent.test + convert-v2x-use-agent.test tests: @for test in *.test; do \ diff --git a/tests/convert-v2x-no-agent.test b/tests/convert-v2x-no-agent.test deleted file mode 100755 index dc42cfc1..00000000 --- a/tests/convert-v2x-no-agent.test +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -echo "Converting from version 2.x (no agent)" -exec ./convert-v2x.test --no-agent diff --git a/tests/convert-v2x-use-agent.test b/tests/convert-v2x-use-agent.test new file mode 100755 index 00000000..642dfcc2 --- /dev/null +++ b/tests/convert-v2x-use-agent.test @@ -0,0 +1,3 @@ +#!/bin/bash +echo "Converting from version 2.x (with gpg-agent)" +exec ./convert-v2x.test --use-agent diff --git a/tests/convert-v2x.test b/tests/convert-v2x.test index e762f8c6..7c963202 100755 --- a/tests/convert-v2x.test +++ b/tests/convert-v2x.test @@ -10,7 +10,7 @@ cat > config << EOF passphrase_file=`pwd`/datafile-v2x.key EOF -launch_pwmd datafile-converted +launch_pwmd $@ datafile-converted begin_test echo 'DUMP' | pwmc $PWMC_ARGS --key-file datafile-v2x.key \ -- 2.11.4.GIT