Index: genexample.scm ================================================================== --- genexample.scm +++ genexample.scm @@ -156,18 +156,18 @@ (print "") (print "[setup]") (print "# Adjust max_concurrent_jobs to limit how much you load your machines") (print "max_concurrent_jobs 50\n") (print "# This is your link path. Avoid moving it once set.") - (print "linktree " (common:real-path lntree)) + (print "linktree " lntree) ;; (common:real-path lntree)) (print "\n# Job tools are more advanced ways to control how your jobs are launched") (print "[jobtools]\nuseshell yes\nlauncher nbfake\nmaxload 1.5\n") (print "# You can override environment variables for all your tests here") (print "[env-override]\nEXAMPLE_VAR example value\n") (print "# As you run more tests you may need to add additional disks, the names are arbitrary but must be unique") - (print "[disks]\ndisk0 " (common:real-path firstd)))) - + (print "[disks]\ndisk0 " firstd))) ;; (common:real-path firstd)))) + (print "================== I'm now creating a runconfigs.config file for you with a default section. You can use this file to set variables for your tests based on the \"target\" (the combination @@ -195,11 +195,11 @@ ;; Now create a test and logpro file (print "================== You now have the basic common files for your megatest setup. Next run -\"megatest -gen-test\" to create a test. +\"megatest -create-test \" to create a test. Thank you for using Megatest. You can edit your config files and create tests in the " path " directory Index: launch.scm ================================================================== --- launch.scm +++ launch.scm @@ -627,11 +627,11 @@ ;; (let* ((test-info (let loop ((tries 0)) (let ((tinfo (rmt:get-test-info-by-id run-id test-id))) (if tinfo tinfo - (if (> tries 10) + (if (> tries 5) #f (begin (thread-sleep! (+ 1 (* tries 10))) (loop (+ tries 1)))))))) (test-host (if test-info Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -521,13 +521,19 @@ (if start-watchdog (thread-start! *watchdog*))) ;; bracket open-output-file with code to make leading directory if it does not exist and handle exceptions -(define (open-logfile logpath) +(define (open-logfile logpath-in) (condition-case - (let* ((log-dir (or (pathname-directory logpath) "."))) + (let* ((log-dir (or (pathname-directory logpath-in) ".")) + (fname (pathname-strip-directory logpath-in)) + (logpath (if (> (string-length fname) 250) + (let ((newlogf (conc log-dir "/" (common:get-signature fname) ".log"))) + (debug:print 0 *default-log-port* "WARNING: log file " logpath-in " path too long, converted to " newlogf) + newlogf) + logpath-in))) (if (not (directory-exists? log-dir)) (system (conc "mkdir -p " log-dir))) (open-output-file logpath)) (exn () (debug:print-error 0 *default-log-port* "Could not open log file for write: "logpath)