Index: runs-inc.scm
==================================================================
--- runs-inc.scm
+++ runs-inc.scm
@@ -1735,12 +1735,13 @@
     ;; setting itemdat to a list if it is #f
     (if (not itemdat)(set! itemdat '()))
     (set! item-path (item-list->path itemdat))
     (set! full-test-name (db:test-make-full-name test-name item-path))
     (runs:set-megatest-env-vars run-id inrunname: runname testname: test-name itempath: item-path) ;; these may be needed by the launching process
-    (let* ((test-conf    (tests:get-testconfig test-name item-path all-tests-registry #t force-create: #t))
-	   ;; (tests:testqueue-get-testconfig test-record ))
+    (let* ((test-conf ;; re-instate the tests:get-testconfig once the kinks are worked out. FIXME!!!
+	    ;; (tests:get-testconfig test-name item-path all-tests-registry #t force-create: #t))
+	    (tests:testqueue-get-testconfig test-record )) 
 	   (test-path    (hash-table-ref all-tests-registry test-name)) ;; (conc *toppath* "/tests/" test-name)) ;; could use tests:get-testconfig here ...
 	   (force        (hash-table-ref/default flags "-force" #f))
 	   (rerun        (hash-table-ref/default flags "-rerun" #f))
 	   (keepgoing    (hash-table-ref/default flags "-keepgoing" #f))
 	   (incomplete-timeout (string->number (or (configf:lookup *configdat* "setup" "incomplete-timeout") "x")))
@@ -1867,17 +1868,21 @@
 			   (set! skip-test "Skipping due to previous tests running"))))
 
 		    ;; split the string and OR of file-exists?
 		    ((and skip-check
 			  (configf:lookup test-conf "skip" "fileexists"))
-		     (if (common:file-exists? (configf:lookup test-conf "skip" "fileexists"))
-			 (set! skip-test (conc "Skipping due to existance of file " (configf:lookup test-conf "skip" "fileexists")))))
-
+		     (let* ((files    (string-split (configf:lookup test-conf "skip" "fileexists")))
+			    (existing (filter common:file-exists? files)))
+		       (if (not (null? existing)) ;; (common:file-exists? (configf:lookup test-conf "skip" "fileexists"))
+			   (set! skip-test (conc "Skipping due to existance of file(s) " (string-intersperse existing ", ")))))) ;; (configf:lookup test-conf "skip" "fileexists")))))
+		    
 		    ((and skip-check
 			  (configf:lookup test-conf "skip" "filenotexists"))
-		     (if (not (common:file-exists? (configf:lookup test-conf "skip" "filenotexists")))
-			 (set! skip-test (conc "Skipping due to non existance of file " (configf:lookup test-conf "skip" "filenotexists")))))
+		      (let* ((files    (string-split (configf:lookup test-conf "skip" "fileexists")))
+			     (existing (filter common:file-exists? files)))
+			(if (null? existing) ;;  (common:file-exists? (configf:lookup test-conf "skip" "filenotexists")))
+			    (set! skip-test (conc "Skipping due to non existance of files " (string-intersperse files ", ")))))) ;; (configf:lookup test-conf "skip" "filenotexists")))))
 		    
 		    ((and skip-check
 			  (configf:lookup test-conf "skip" "script"))
 		     (if (= (system (configf:lookup test-conf "skip" "script")) 0)
 			 (set! skip-test (conc "Skipping due to zero return value of script " (configf:lookup test-conf "skip" "script")))))