@@ -1754,35 +1754,41 @@
   ;; This is for Tal's issue with item-specific env vars not being set for use in skip.
   ;; HSD https://hsdes.intel.com/appstore/icf/index.html#/article?articleId=1408763273
   ;;
   (let* ((test-name    (tests:testqueue-get-testname   test-record))
 	 (test-waitons (tests:testqueue-get-waitons    test-record))
-	 (test-conf    (tests:testqueue-get-testconfig test-record))
 	 (itemdat      (tests:testqueue-get-itemdat    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")))
 	 (item-path     "")
 	 (db           #f)
 	 (full-test-name #f))
 
     ;; 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 ;; 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")))
+	   )
+
     (debug:print-info 4 *default-log-port*
 		      "\nTESTNAME: " full-test-name 
 		      "\n   test-config: " (hash-table->alist test-conf)
 		      "\n   itemdat: " itemdat
 		      )
     (debug:print 2 *default-log-port* "Attempting to launch test " full-test-name)
     ;; (setenv "MT_TEST_NAME" test-name) ;; 
     ;; (setenv "MT_ITEMPATH"  item-path)
     ;; (setenv "MT_RUNNAME"   runname)
-    (runs:set-megatest-env-vars run-id inrunname: runname testname: test-name itempath: item-path) ;; these may be needed by the launching process
     (change-directory *toppath*)
 
     ;; Here is where the test_meta table is best updated
     ;; Yes, another use of a global for caching. Need a better way?
     ;;
@@ -1890,21 +1896,26 @@
 		   ;; run-ids = #f means *all* runs
 		   (let ((running-tests (rmt:get-tests-for-runs-mindata #f full-test-name '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED") '() #f)))
 		     (if (not (null? running-tests)) ;; have to skip 
 			 (set! skip-test "Skipping due to previous tests running"))))
 
-		  ((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")))))
-
-		  ((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")))))
-		 
-                  ((and skip-check
+ 		    ;; split the string and OR of file-exists?
+		    ((and skip-check
+			  (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"))
+		      (let* ((files    (string-split (configf:lookup test-conf "skip" "filenotexists")))
+			      (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")))))
       
                   ((and skip-check
@@ -1949,11 +1960,11 @@
 	 (debug:print-error 0 *default-log-port* "Failed to launch test " full-test-name ". Unrecognised state " (test:get-state testdat))
 	 (case (string->symbol (test:get-state testdat)) 
 	   ((COMPLETED INCOMPLETE)
 	    (hash-table-set! test-registry (db:test-make-full-name test-name test-path) 'DONOTRUN))
 	   (else
-	    (hash-table-set! test-registry (db:test-make-full-name test-name test-path) 'DONOTRUN))))))))
+	    (hash-table-set! test-registry (db:test-make-full-name test-name test-path) 'DONOTRUN)))))))))
 
 ;;======================================================================
 ;; END OF NEW STUFF
 ;;======================================================================