Rename test Kerberos configuration files for clarity

Now that we can generate the queue file, let's call these something
that makes it clearer what they are.

diff --git a/Makefile.am b/Makefile.am
index c388b8d5b0c18c1405cfcd793fb9d7ea63b65196..324b60bccbae97bf1673e0baca1251671847b5a6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,10 +9,10 @@
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = .gitignore LICENSE autogen patches/README                 \
        patches/heimdal-1.3.1 tests/README tests/TESTS                  \
-       tests/data/default.conf tests/data/empty.conf                   \
-       tests/data/make-krb5-conf tests/data/queue.conf                 \
-       tests/docs/pod-spelling-t tests/docs/pod-t tests/tap/libtap.sh  \
-       tests/util/xmalloc-t tools/krb5-sync.pod
+       tests/data/krb5-empty.conf tests/data/krb5.conf                 \
+       tests/data/make-krb5-conf tests/docs/pod-spelling-t             \
+       tests/docs/pod-t tests/tap/libtap.sh tests/util/xmalloc-t       \
+       tools/krb5-sync.pod
 
 # Everything in the package needs to be able to find the Kerberos headers
 # and libraries.

diff --git a/tests/data/empty.conf b/tests/data/krb5-empty.conf
similarity index 100%
rename from tests/data/empty.conf
rename to tests/data/krb5-empty.conf

diff --git a/tests/data/default.conf b/tests/data/krb5.conf
similarity index 100%
rename from tests/data/default.conf
rename to tests/data/krb5.conf

diff --git a/tests/plugin/heimdal-t.c b/tests/plugin/heimdal-t.c
index 27b248d6c65f718a89102ff624368f47136ac43e..1dec427c8c8eef67b06c234bcc75f746a5b73993 100644 (file)
--- a/tests/plugin/heimdal-t.c
+++ b/tests/plugin/heimdal-t.c
@@ -68,9 +68,9 @@ main(void)
     char *wanted;
 
     /* Set up the default krb5.conf file. */
-    path = test_file_path("data/default.conf");
+    path = test_file_path("data/krb5.conf");
     if (path == NULL)
-        bail("cannot find data/default.conf in the test suite");
+        bail("cannot find data/krb5.conf in the test suite");
     basprintf(&krb5_config, "KRB5_CONFIG=%s", path);
     if (putenv(krb5_config) < 0)
         sysbail("cannot set KRB5CCNAME");

diff --git a/tests/plugin/mit-t.c b/tests/plugin/mit-t.c
index 447565398d28f6e300fb0b0412b160219bf009ac..f33fd71c6a59bb0abed593c8ec649b80da44aadf 100644 (file)
--- a/tests/plugin/mit-t.c
+++ b/tests/plugin/mit-t.c
@@ -54,9 +54,9 @@ main(void)
     char *wanted;
 
     /* Set up the default krb5.conf file. */
-    path = test_file_path("data/default.conf");
+    path = test_file_path("data/krb5.conf");
     if (path == NULL)
-        bail("cannot find data/default.conf in the test suite");
+        bail("cannot find data/krb5.conf in the test suite");
     basprintf(&krb5_config, "KRB5_CONFIG=%s", path);
     if (putenv(krb5_config) < 0)
         sysbail("cannot set KRB5CCNAME");

diff --git a/tests/plugin/queue-only-t.c b/tests/plugin/queue-only-t.c
index 46962e7ebef78bec8bbd4ceeb28eba872931da52..7b47df6e492d46ffee86b991d561ede7289606a5 100644 (file)
--- a/tests/plugin/queue-only-t.c
+++ b/tests/plugin/queue-only-t.c
@@ -40,9 +40,9 @@ main(void)
     plan(23);
 
     /* Set up a temporary directory and queue relative to it. */
-    path = test_file_path("data/default.conf");
+    path = test_file_path("data/krb5.conf");
     if (path == NULL)
-        bail("cannot find data/default.conf in the test suite");
+        bail("cannot find data/krb5.conf in the test suite");
     tmpdir = test_tmpdir();
     if (chdir(tmpdir) < 0)
         sysbail("cannot cd to %s", tmpdir);

diff --git a/tests/plugin/queuing-t.c b/tests/plugin/queuing-t.c
index a28d5c104dbe39b538e6775745fb43d2bb1407bb..fc06da4d6f639f15e9f8ad3f5fc8239391d2622d 100644 (file)
--- a/tests/plugin/queuing-t.c
+++ b/tests/plugin/queuing-t.c
@@ -50,7 +50,7 @@ main(void)
         sysbail("cannot mkdir queue");
 
     /* Point KRB5_CONFIG at the correct krb5.conf file. */
-    path = test_file_path("data/default.conf");
+    path = test_file_path("data/krb5.conf");
     if (path == NULL)
         bail("cannot find data/krb5.conf in the test suite");
     basprintf(&krb5_config, "KRB5_CONFIG=%s", path);
@@ -115,9 +115,9 @@ main(void)
     test_file_path_free(path);
 
     /* Change to an empty Kerberos configuration file. */
-    path = test_file_path("data/empty.conf");
+    path = test_file_path("data/krb5-empty.conf");
     if (path == NULL)
-        bail("cannot find data/empty.conf in the test suite");
+        bail("cannot find data/krb5-empty.conf in the test suite");
     old_krb5_config = krb5_config;
     basprintf(&krb5_config, "KRB5_CONFIG=%s", path);
     if (putenv(krb5_config) < 0)