1 files changed, 14 insertions, 1 deletions
diff --git a/test/testframe.c b/test/testframe.c
index 4478cb4..f4c19c2 100644
--- a/test/testframe.c
+++ b/test/testframe.c
@@ -266,7 +266,7 @@ void TestParseCmdLine(int argc, char *argv[])
             exit(0);
         }
 	else if ((HDstrcmp(*argv, "-cleanoff") == 0) || (HDstrcmp(*argv, "-c") == 0))
-            CleanUp = 0;
+	    SetTestNoCleanup();
 	else {
 	    /* non-standard option.  Break out. */
 	    break;
@@ -394,6 +394,19 @@ int GetTestCleanup(void)
 }
 
 /*
+ * Set cleanup to no.
+ * Return previous cleanup value.
+ */
+int SetTestNoCleanup(void)
+{
+    int oldval;
+
+    oldval = CleanUp;
+    CleanUp = 0;
+    return(oldval);
+}
+
+/*
  * Parse an argument string for verbosity level and set it.
  */
 void ParseTestVerbosity(char *argv)