From 59d0ef0b17e8fb8c6c05b8de07de0767b76823e1 Mon Sep 17 00:00:00 2001
From: Michael Rash <mbr@cipherdyne.org>
Date: Tue, 24 Mar 2015 22:03:21 -0400
Subject: [PATCH] [test suite] minor file rename

---
 Makefile.am                                         |   2 +-
 test/conf/{gpg_dirs_orig.tar.gz => gpg_dirs.tar.gz} | Bin
 test/test-fwknop.pl                                 |   6 +++---
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename test/conf/{gpg_dirs_orig.tar.gz => gpg_dirs.tar.gz} (100%)

diff --git a/Makefile.am b/Makefile.am
index 852f8631..22f695db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -121,7 +121,7 @@ EXTRA_DIST = \
     python/setup.py \
     python/fkomodule.c \
     python/fko.py \
-    test/conf/gpg_dirs_orig.tar.gz \
+    test/conf/gpg_dirs.tar.gz \
     test/conf/hmac_android_access.conf \
     test/conf/android_access.conf \
     test/conf/android_legacy_iv_access.conf \
diff --git a/test/conf/gpg_dirs_orig.tar.gz b/test/conf/gpg_dirs.tar.gz
similarity index 100%
rename from test/conf/gpg_dirs_orig.tar.gz
rename to test/conf/gpg_dirs.tar.gz
diff --git a/test/test-fwknop.pl b/test/test-fwknop.pl
index 7dfbacb8..9cb70c98 100755
--- a/test/test-fwknop.pl
+++ b/test/test-fwknop.pl
@@ -31,7 +31,7 @@ my $key_tmp         = 'key.tmp';
 my $enc_save_tmp    = 'openssl_save.enc';
 my $test_suite_path = 'test-fwknop.pl';
 my $username        = '';
-my $gpg_dir_orig_tar = 'gpg_dirs_orig.tar.gz';
+my $gpg_dirs_tar = 'gpg_dirs.tar.gz';
 our $gpg_client_home_dir = "$conf_dir/client-gpg";
 our $gpg_client_home_dir_no_pw = "$conf_dir/client-gpg-no-pw";
 our $replay_pcap_file     = "$conf_dir/spa_replay.pcap";
@@ -6876,8 +6876,8 @@ sub restore_gpg_dirs() {
 
     chdir $conf_dir or die $!;
 
-    if (-e $gpg_dir_orig_tar) {
-        system "tar xfz $gpg_dir_orig_tar > /dev/null";
+    if (-e $gpg_dirs_tar) {
+        system "tar xfz $gpg_dirs_tar > /dev/null";
     }
 
     chdir $curr_pwd or die $!;