@@ -47,14 +47,17 @@
 		               (begin
 		                 (debug:print 0 "ERROR: Called setup in a non-megatest area, exiting")
 		                 (exit 1)))))
 	  (runrec      (runs:runrec-make-record))
 	  (target      (common:args-get-target))
-	  (runname     (or (args:get-arg "-runname")
-		           (args:get-arg ":runname")))
-	  (testpatt    (or (args:get-arg "-testpatt")
-		           (args:get-arg "-runtests")))
+	  (runname     (common:args-get-runname))
+	  (testpatt    (common:args-get-testpatt))
+;; 	  (args-testpatt (or (args:get-arg "-testpatt")
+;; 			     (args:get-arg "-runtests")))
+;; 	  (testpatt    (or (and (equal? args-testpatt "%")
+;; 				(getenv "TESTPATT"))
+;; 			   args-testpatt))
 	  (keys        (keys:config-get-fields mconfig))
 	  (keyvals     (keys:target->keyval keys target))
 	  (toppath     *toppath*)
 	  (envdat      keyvals) ;; initial values start with keyvals
 	  (runconfig   #f)