diff options
| -rw-r--r-- | src/Job.hs | 1 | ||||
| -rw-r--r-- | src/Output.hs | 4 | ||||
| -rw-r--r-- | test/script/common.et | 2 |
3 files changed, 7 insertions, 0 deletions
@@ -266,6 +266,7 @@ runJobs mngr@JobManager {..} tout jobs rerun = do mbStatus -> do when (isJust mbStatus) $ do liftIO $ removeDirectoryRecursive jdir + liftIO $ outputEvent tout $ JobEnqueued (jobId taskJob) uses <- waitForUsedArtifacts tout taskJob results taskStatus runManagedJob mngr taskId (return JobCancelled) $ do liftIO $ atomically $ writeTVar taskStatus JobRunning diff --git a/src/Output.hs b/src/Output.hs index 5fa2f81..e9ce718 100644 --- a/src/Output.hs +++ b/src/Output.hs @@ -42,6 +42,7 @@ data OutputEvent = OutputMessage Text | TestMessage Text | LogMessage Text + | JobEnqueued JobId | JobStarted JobId | JobFinished JobId Text | JobIsDuplicate JobId Text @@ -104,6 +105,9 @@ outputEvent out@Output {..} = liftIO . \case LogMessage msg -> do forM_ outLogs $ \h -> outStrLn out h msg + JobEnqueued jid -> do + forM_ outTest $ \h -> outStrLn out h ("job-enqueue " <> textJobId jid) + JobStarted jid -> do forM_ outLogs $ \h -> outStrLn out h ("Started " <> textJobId jid) forM_ outTest $ \h -> outStrLn out h ("job-start " <> textJobId jid) diff --git a/test/script/common.et b/test/script/common.et index 8875c79..fe7579c 100644 --- a/test/script/common.et +++ b/test/script/common.et @@ -4,6 +4,7 @@ module common export def expect_result from p of job result result: let dummy = job == "" # TODO: forces string type expect from p: + /job-enqueue $job/ /job-start $job/ /job-finish $job ([a-z]+)/ capture done guard (done == result) @@ -23,4 +24,5 @@ export def expect_previous_success from p of job: export def expect_skip from p of job: let dummy = job == "" # TODO: forces string type expect from p: + /job-enqueue $job/ /job-skip $job/ |