Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -263,23 +263,23 @@
 (if (args:get-arg "-env2file")
     (begin
       (save-environment-as-files (args:get-arg "-env2file"))
       (set! *didsomething* #t)))
 
-(if (args:get-arg "-list-targets")
-    (print (string-intersperse
-	    (sort (map car (hash-table->alist
-			    (read-config "runconfigs.config"
-					 (make-hash-table) #f))) string<?) "\n")))
-
-
-(if (args:get-arg "-list-disks")
-    (print (string-intersperse 
-	    (map cadr (hash-table-ref/default 
-		       (read-config "megatest.config" #f #t) 
-		       "disks" "'" 
-		       ("none" ""))) "\n")))
+;; (if (args:get-arg "-list-targets")
+;;     (print (string-intersperse
+;; 	    (sort (map car (hash-table->alist
+;; 			    (read-config "runconfigs.config"
+;; 					 (make-hash-table) #f))) string<?) "\n")))
+;; 
+;; 
+;; (if (args:get-arg "-list-disks")
+;;     (print (string-intersperse 
+;; 	    (map cadr (hash-table-ref/default 
+;; 		       (read-config "megatest.config" #f #t) 
+;; 		       "disks" "'" 
+;; 		       ("none" ""))) "\n")))
 
 ;;======================================================================
 ;; Start the server - can be done in conjunction with -runall or -runtests (one day...)
 ;;   we start the server if not running else start the client thread
 ;;======================================================================

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -49,12 +49,12 @@
 test5 : fullprep
 	cd fullrun;sleep  0;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_aa -debug $(DEBUG) $(LOGGING) > aa.log 2> aa.log &
 	cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ab -debug $(DEBUG) $(LOGGING) > ab.log 2> ab.log &
 	cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ac -debug $(DEBUG) $(LOGGING) > ac.log 2> ac.log &
 	cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ad -debug $(DEBUG) $(LOGGING) > ad.log 2> ad.log &	
-	cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ae -debug $(DEBUG) $(LOGGING) > ae.log 2> ae.log &	
-	cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_af -debug $(DEBUG) $(LOGGING) > af.log 2> af.log &	
+	# cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ae -debug $(DEBUG) $(LOGGING) > ae.log 2> ae.log &	
+	# cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_af -debug $(DEBUG) $(LOGGING) > af.log 2> af.log &	
 
 test6: fullprep
 	cd fullrun;$(MEGATEST) -runtests runfirst -testpatt %/1 -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_itempatt -v
 	cd fullrun;$(MEGATEST) -runtests runfirst -testpatt %blahha% -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_itempatt -debug 10
 	cd fullrun;$(MEGATEST) -rollup :runname newrun -target ubuntu/nfs/none -debug 10