Index: launch.scm ================================================================== --- launch.scm +++ launch.scm @@ -327,11 +327,11 @@ (rmt:roll-up-pass-fail-counts run-id test-name item-path "RUNNING") ;; (thread-sleep! 0.3) ;; NFS slowness has caused grief here ;; if there is a runscript do it first (if fullrunscript - (let ((pid (process-run fullrunscript))) + (let ((pid (process-run "/bin/bash" (list "-c" (conc fullrunscript " >> " work-area "/mt_launch.log 2>&1"))))) (rmt:test-set-top-process-pid run-id test-id pid) (let loop ((i 0)) (let-values (((pid-val exit-status exit-code) (process-wait pid #t))) (mutex-lock! m) Index: tests/fullrun/tests/all_toplevel/testconfig ================================================================== --- tests/fullrun/tests/all_toplevel/testconfig +++ tests/fullrun/tests/all_toplevel/testconfig @@ -1,13 +1,50 @@ [ezsteps] calcresults megatest -list-runs $MT_RUNNAME -target $MT_TARGET [requirements] -waiton all_toplevel exit_0 exit_1 ez_exit2_fail ez_fail ez_pass ezlog_fail \ - ezlog_fail_then_pass ezlog_pass ezlog_warn lineitem_fail lineitem_pass logpro_required_fail \ - manual_example neverrun priority_1 priority_10 priority_10_waiton_1 priority_2 \ - priority_3 priority_4 priority_5 priority_6 priority_7 priority_8 \ - priority_9 runfirst singletest singletest2 sqlitespeed test_mt_vars \ - ez_fail_quick test1 test2 special blocktestxz +waiton \ +exit_0 \ +exit_1 \ +ez_exit2_fail \ +ez_fail \ +ez_fail_quick \ +ezlog_fail \ +ezlog_fail_then_pass \ +ezlog_pass \ +ezlog_warn \ +ez_pass \ +lineitem_fail \ +lineitem_pass \ +logpro_required_fail \ +manual_example \ +neverrun \ +priority_1 \ +priority_10 \ +priority_10_waiton_1 \ +priority_3 \ +priority_4 \ +priority_5 \ +priority_6 \ +priority_7 \ +priority_8 \ +priority_9 \ +runfirst \ +singletest \ +singletest2 \ +special \ +sqlitespeed \ +test1 \ +test2 + +# exit_0 exit_1 ez_exit2_fail ez_fail ez_pass ezlog_fail \ +# ezlog_fail_then_pass ezlog_pass ezlog_warn lineitem_fail lineitem_pass logpro_required_fail \ +# manual_example neverrun priority_1 priority_10 priority_10_waiton_1 priority_2 \ +# priority_3 priority_4 priority_5 priority_6 priority_7 priority_8 \ +# priority_9 runfirst singletest singletest2 sqlitespeed test_mt_vars \ +# ez_fail_quick test1 test2 special blocktestxz # This is a "toplevel" test, it does not require waitons to be non-FAIL to run mode toplevel + + +# matt@xena:~/ $ $MT_MEGATEST -list-runs $MT_RUNNAME -target $MT_TARGET|grep Test:|grep 'State: COMPL'|awk '{print $2}'|cut -d\( -f1|sort -u Index: tests/simplerun/tests/test1/step1.sh ================================================================== --- tests/simplerun/tests/test1/step1.sh +++ tests/simplerun/tests/test1/step1.sh @@ -1,5 +1,4 @@ #!/usr/bin/env bash # Run your step here echo Got here! -