X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=tests%2Fcommon%2Fconfig.c;h=6a0e3e1ef203bbd6dcc1e0ebce42003a57064a46;hp=8f143b4172d24f0b49c8c34715b2eecf8a443624;hb=733dcec01784617e3354c2b8b29f50b09464a4bb;hpb=91de2dd08727f4cd1da124c4966d7a41a7ab99cf

diff --git a/tests/common/config.c b/tests/common/config.c
index 8f143b4..6a0e3e1 100644
--- a/tests/common/config.c
+++ b/tests/common/config.c
@@ -35,6 +35,7 @@
 
 #include <hcrypto/des.h>
 
+#include <tests/tap/basic.h>
 #include "common.h"
 
 static FILE *
@@ -120,11 +121,20 @@ fail:
 void
 afstest_UnlinkTestConfig(char *dir)
 {
-    unlinkConfigFile(dir, "KeyFile");
-    unlinkConfigFile(dir, "CellServDB");
-    unlinkConfigFile(dir, "ThisCell");
-    unlinkConfigFile(dir, "UserList");
-    rmdir(dir);
+    DIR *dirp;
+    struct dirent *de;
+
+    /* Sanity check, only zap directories that look like ours */
+    if (!strstr(dir, "afs_"))
+	return;
+    if (getenv("MAKECHECK") != NULL) {
+	dirp = opendir(dir);
+	if (!dirp)
+	    return;
+	while ((de = readdir(dirp)))
+	    unlinkConfigFile(dir, de->d_name);
+	rmdir(dir);
+    }
 }
 
 int