summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Command/Extract.hs5
-rw-r--r--src/Command/Run.hs9
-rw-r--r--src/Expression.hs2
-rw-r--r--src/Job/Types.hs34
-rw-r--r--test/script/artifact.et22
-rw-r--r--test/script/publish.et8
-rw-r--r--test/script/repo.et72
-rw-r--r--test/script/run.et434
-rw-r--r--test/script/shell.et2
9 files changed, 304 insertions, 284 deletions
diff --git a/src/Command/Extract.hs b/src/Command/Extract.hs
index 8dee537..3f78e2e 100644
--- a/src/Command/Extract.hs
+++ b/src/Command/Extract.hs
@@ -32,9 +32,8 @@ instance CommandArgumentsType ExtractArguments where
extractDestination <- return (last args)
return ExtractArguments {..}
where
- toArtifactRef tref = case T.breakOnEnd "." (T.pack tref) of
- (jobref', aref) | Just ( jobref, '.' ) <- T.unsnoc jobref'
- -> return ( parseJobRef jobref, ArtifactName aref )
+ toArtifactRef tref = case parseJobRefParts $ T.pack tref of
+ parts@(_ : _) -> return ( JobRef $ init parts, ArtifactName $ last parts )
_ -> throwError $ "too few parts in artifact ref ‘" <> tref <> "’"
_ -> throwError "too few arguments"
diff --git a/src/Command/Run.hs b/src/Command/Run.hs
index ccd4bfa..6419c58 100644
--- a/src/Command/Run.hs
+++ b/src/Command/Run.hs
@@ -10,6 +10,7 @@ import Control.Monad.IO.Class
import Data.Char
import Data.Containers.ListUtils
+import Data.Either
import Data.List
import Data.Maybe
import Data.Text (Text)
@@ -314,10 +315,14 @@ cmdRun (RunCommand RunOptions {..} args) = do
]
let ( nameOptions, jobOptions ) = partition (T.all $ \c -> isAlphaNum c || c == '_') args
- ( refOptions, exprOptions ) = partition (\r -> "." `T.isInfixOf` r && not (".." `T.isInfixOf` r)) jobOptions
+ ( refOptions, exprOptions ) = partitionEithers $ map splitRefs jobOptions
+ splitRefs t = case parseJobRef t of
+ JobRef [ e ] -> Right e
+ JobRef [ e, "" ] -> Right e
+ ref -> Left ref
argumentJobs <- argumentJobSource $ map JobName nameOptions
- refJobs <- refJobSource $ map parseJobRef refOptions
+ refJobs <- refJobSource refOptions
exprJobs <- forM exprOptions $ \trange ->
case parseRangeExpression trange of
diff --git a/src/Expression.hs b/src/Expression.hs
index 95ba815..3fc6e7a 100644
--- a/src/Expression.hs
+++ b/src/Expression.hs
@@ -156,7 +156,7 @@ parseRangeExpression = bimap errorBundlePretty id . runParser parser ""
return $ RangeExpression rev1 (ModifiedRevision "^" rev1)
]
- (char ':' >> eof) <|> eof
+ eof
return expr
parseRevision :: ExprParser DeclaredRevisionExpression
diff --git a/src/Job/Types.hs b/src/Job/Types.hs
index 50f550d..c7a859d 100644
--- a/src/Job/Types.hs
+++ b/src/Job/Types.hs
@@ -135,21 +135,37 @@ textJobIdPart = \case
JobIdRepo _ (JobIdTag cid tid) -> textCommitId cid <> "^" <> textTagId tid
textJobId :: JobId -> Text
-textJobId (JobId ids) = T.intercalate "." $ map textJobIdPart ids
+textJobId (JobId ids) = T.intercalate ":" $ map textJobIdPart ids
parseJobRef :: Text -> JobRef
-parseJobRef = JobRef . go 0 ""
+parseJobRef = JobRef . parseJobRefParts
+
+parseJobRefParts :: Text -> [ Text ]
+parseJobRefParts = go [ ':', '.' ] 0 False ""
where
- go :: Int -> Text -> Text -> [ Text ]
- go plevel cur s = do
+ go :: [ Char ] -> Int -> Bool -> Text -> Text -> [ Text ]
+ go seps plevel pdrop cur s = do
let bchars | plevel > 0 = [ '(', ')' ]
- | otherwise = [ '.', '(', ')' ]
+ | otherwise = seps ++ [ '(', ')' ]
let ( part, rest ) = T.break (`elem` bchars) s
case T.uncons rest of
- Just ( '.', rest' ) -> (cur <> part) : go plevel "" rest'
- Just ( '(', rest' ) -> go (plevel + 1) (cur <> part) rest'
- Just ( ')', rest' ) -> go (plevel - 1) (cur <> part) rest'
- _ -> [ cur <> part ]
+ Just ( '.', rest' )
+ | Just ( '.', rest'' ) <- T.uncons rest'
+ -> go seps plevel pdrop (cur <> part <> "..") rest''
+ Just ( sep, rest' )
+ | sep `elem` seps
+ -> (cur <> part) : go [ sep ] plevel pdrop "" rest'
+ Just ( '(', rest' )
+ | T.null cur && T.null part
+ -> go seps (plevel + 1) True (cur <> part) rest'
+ | otherwise
+ -> go seps (plevel + 1) pdrop (cur <> part <> "(") rest'
+ Just ( ')', rest' )
+ | T.null rest' && pdrop
+ -> go seps (plevel - 1) False (cur <> part) rest'
+ | otherwise
+ -> go seps (plevel - 1) pdrop (cur <> part <> ")") rest'
+ _ -> [ cur <> part ]
lastJobNameId :: JobId -> Maybe JobName
lastJobNameId (JobId ids) = go Nothing ids
diff --git a/test/script/artifact.et b/test/script/artifact.et
index d353b49..c8a726c 100644
--- a/test/script/artifact.et
+++ b/test/script/artifact.et
@@ -11,14 +11,14 @@ test ExtractArtifact:
expect /job-finish generate done/ from p
local:
- spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "generate.first", "extracted" ]
+ spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "generate:first", "extracted" ]
local:
shell on n as s:
cat ./extracted
expect /content 1/ from s
local:
- spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "generate.second", "generate.third", "." ]
+ spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "generate:second", "generate:third", "." ]
local:
shell on n as s:
cat ./f2
@@ -27,7 +27,7 @@ test ExtractArtifact:
expect /content 3/ from s
local:
- spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "generate.dir", "." ]
+ spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "generate:dir", "." ]
local:
shell on n as s:
cat ./dir/f2
@@ -38,7 +38,7 @@ test ExtractArtifact:
expect /content b/ from s
local:
- spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "generate.sdir", "extracted_subdir" ]
+ spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "generate:sdir", "extracted_subdir" ]
local:
shell on n as s:
cat ./extracted_subdir/fb
@@ -61,7 +61,7 @@ test ExtractArtifactForce:
local:
shell on n:
touch extracted
- spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "--force", "generate.first", "extracted" ]
+ spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "--force", "generate:first", "extracted" ]
local:
shell on n as s:
cat ./extracted
@@ -71,13 +71,13 @@ test ExtractArtifactForce:
#local:
# shell on n:
# touch f1
- # spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "generate.first", "." ]
+ # spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "generate:first", "." ]
#local:
local:
shell on n:
touch f1
- spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "--force", "generate.first", "." ]
+ spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "--force", "generate:first", "." ]
local:
shell on n as s:
cat ./f1
@@ -88,14 +88,14 @@ test ExtractArtifactForce:
# shell on n:
# mkdir dir
# touch dir/existing_file
- # spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "generate.dir", "." ]
+ # spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "generate:dir", "." ]
#local:
local:
shell on n:
mkdir dir
touch dir/existing_file
- spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "--force", "generate.dir", "." ]
+ spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "--force", "generate:dir", "." ]
local:
shell on n as s:
ls dir
@@ -110,13 +110,13 @@ test ExtractArtifactForce:
#local:
# shell on n:
# touch dir
- # spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "generate.dir", "." ]
+ # spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "generate:dir", "." ]
#local:
local:
shell on n:
touch dir
- spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "--force", "generate.dir", "." ]
+ spawn on n as p args [ "--storage=.minici", "${scripts.path}/minici.yaml", "extract", "--force", "generate:dir", "." ]
local:
shell on n as s:
ls dir
diff --git a/test/script/publish.et b/test/script/publish.et
index 29d0742..690e82d 100644
--- a/test/script/publish.et
+++ b/test/script/publish.et
@@ -131,11 +131,11 @@ test PushRepo:
let cmd_run = [ "--repo=source_repo:workdir", "--repo=target_repo:target.git", "run" ]
local:
- spawn on n as p args (cmd_run ++ [ "push_job.$cb" ]) killwith SIGINT
+ spawn on n as p args (cmd_run ++ [ "push_job:$cb" ]) killwith SIGINT
expect from p:
- /job-enqueue push_job.$cb/
- /job-start push_job.$cb/
- /job-finish push_job.$cb done/
+ /job-enqueue push_job:$cb/
+ /job-start push_job:$cb/
+ /job-finish push_job:$cb done/
expect /(.*)/ from p capture finish
guard (finish == "run-finish")
diff --git a/test/script/repo.et b/test/script/repo.et
index 1ac05a2..6428d69 100644
--- a/test/script/repo.et
+++ b/test/script/repo.et
@@ -171,16 +171,16 @@ test CheckoutSubtree:
local:
spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "run", "--rerun-all", "checkout_subtree" ]
- expect_success from p of "$mt.checkout_subtree.$r1t.$r2s1"
+ expect_success from p of "$mt:checkout_subtree:$r1t:$r2s1"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "run", "--rerun-all", "$mt.checkout_subtree.$r1t.$r2s1" ]
- expect_success from p of "$mt.checkout_subtree.$r1t.$r2s1"
+ spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "run", "--rerun-all", "$mt:checkout_subtree:$r1t:$r2s1" ]
+ expect_success from p of "$mt:checkout_subtree:$r1t:$r2s1"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "extract", "$mt.checkout_subtree.$r1t.$r2s1.out", "list" ]
+ spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "extract", "$mt:checkout_subtree:$r1t:$r2s1:out", "list" ]
local:
shell on n as list:
cat list
@@ -194,16 +194,16 @@ test CheckoutSubtree:
local:
spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "run", "--rerun-all", "checkout_common_root" ]
- expect_success from p of "$mt.checkout_common_root.$r1t.$r2t"
+ expect_success from p of "$mt:checkout_common_root:$r1t:$r2t"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "run", "--rerun-all", "$mt.checkout_common_root.$r1t.$r2t" ]
- expect_success from p of "$mt.checkout_common_root.$r1t.$r2t"
+ spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "run", "--rerun-all", "$mt:checkout_common_root:$r1t:$r2t" ]
+ expect_success from p of "$mt:checkout_common_root:$r1t:$r2t"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "extract", "$mt.checkout_common_root.$r1t.$r2t.out", "list" ]
+ spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "extract", "$mt:checkout_common_root:$r1t:$r2t:out", "list" ]
local:
shell on n as list:
cat list
@@ -218,16 +218,16 @@ test CheckoutSubtree:
local:
spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "run", "--rerun-all", "checkout_common_subtree" ]
- expect_success from p of "$mt.checkout_common_subtree.$r3ab"
+ expect_success from p of "$mt:checkout_common_subtree:$r3ab"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "run", "--rerun-all", "$mt.checkout_common_subtree.$r3ab" ]
- expect_success from p of "$mt.checkout_common_subtree.$r3ab"
+ spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "run", "--rerun-all", "$mt:checkout_common_subtree:$r3ab" ]
+ expect_success from p of "$mt:checkout_common_subtree:$r3ab"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "extract", "$mt.checkout_common_subtree.$r3ab.out", "list" ]
+ spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "extract", "$mt:checkout_common_subtree:$r3ab:out", "list" ]
local:
shell on n as list:
cat list
@@ -241,16 +241,16 @@ test CheckoutSubtree:
local:
spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "run", "--rerun-all", "checkout_common_subtree2" ]
- expect_success from p of "$mt.checkout_common_subtree2.$r1t.$r2s1.$r3abc"
+ expect_success from p of "$mt:checkout_common_subtree2:$r1t:$r2s1:$r3abc"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "run", "--rerun-all", "$mt.checkout_common_subtree2.$r1t.$r2s1.$r3abc" ]
- expect_success from p of "$mt.checkout_common_subtree2.$r1t.$r2s1.$r3abc"
+ spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "run", "--rerun-all", "$mt:checkout_common_subtree2:$r1t:$r2s1:$r3abc" ]
+ expect_success from p of "$mt:checkout_common_subtree2:$r1t:$r2s1:$r3abc"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "extract", "$mt.checkout_common_subtree2.$r1t.$r2s1.$r3abc.out", "list" ]
+ spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "extract", "$mt:checkout_common_subtree2:$r1t:$r2s1:$r3abc:out", "list" ]
local:
shell on n as list:
cat list
@@ -266,20 +266,20 @@ test CheckoutSubtree:
local:
spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "run", "--rerun-all", "combined_subtree" ]
- expect_success from p of "$mt.checkout_common_root.$r1t.$r2t"
- expect_success from p of "$mt.checkout_common_subtree2.$r1t.$r2s1.$r3abc"
- expect_success from p of "$mt.combined_subtree.$r1t.$r2t.$r3abc"
+ expect_success from p of "$mt:checkout_common_root:$r1t:$r2t"
+ expect_success from p of "$mt:checkout_common_subtree2:$r1t:$r2s1:$r3abc"
+ expect_success from p of "$mt:combined_subtree:$r1t:$r2t:$r3abc"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "run", "--rerun-all", "$mt.combined_subtree.$r1t.$r2t.$r3abc" ]
- expect_success from p of "$mt.checkout_common_root.$r1t.$r2t"
- expect_success from p of "$mt.checkout_common_subtree2.$r1t.$r2s1.$r3abc"
- expect_success from p of "$mt.combined_subtree.$r1t.$r2t.$r3abc"
+ spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "run", "--rerun-all", "$mt:combined_subtree:$r1t:$r2t:$r3abc" ]
+ expect_success from p of "$mt:checkout_common_root:$r1t:$r2t"
+ expect_success from p of "$mt:checkout_common_subtree2:$r1t:$r2s1:$r3abc"
+ expect_success from p of "$mt:combined_subtree:$r1t:$r2t:$r3abc"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "extract", "$mt.combined_subtree.$r1t.$r2t.$r3abc.out", "list" ]
+ spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "extract", "$mt:combined_subtree:$r1t:$r2t:$r3abc:out", "list" ]
local:
shell on n as list:
cat list
@@ -294,24 +294,24 @@ test CheckoutSubtree:
local:
spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "run", "--rerun-all", "combined_all" ]
- expect_success from p of "$mt.checkout_subtree.$r1t.$r2s1"
- expect_success from p of "$mt.checkout_common_root.$r1t.$r2t"
- expect_success from p of "$mt.checkout_common_subtree.$r3ab"
- expect_success from p of "$mt.checkout_common_subtree2.$r1t.$r2s1.$r3abc"
- expect_success from p of "$mt.combined_all.$r1t.$r2t.$r3ab"
+ expect_success from p of "$mt:checkout_subtree:$r1t:$r2s1"
+ expect_success from p of "$mt:checkout_common_root:$r1t:$r2t"
+ expect_success from p of "$mt:checkout_common_subtree:$r3ab"
+ expect_success from p of "$mt:checkout_common_subtree2:$r1t:$r2s1:$r3abc"
+ expect_success from p of "$mt:combined_all:$r1t:$r2t:$r3ab"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "run", "--rerun-all", "$mt.combined_all.$r1t.$r2t.$r3ab" ]
- expect_success from p of "$mt.checkout_subtree.$r1t.$r2s1"
- expect_success from p of "$mt.checkout_common_root.$r1t.$r2t"
- expect_success from p of "$mt.checkout_common_subtree.$r3ab"
- expect_success from p of "$mt.checkout_common_subtree2.$r1t.$r2s1.$r3abc"
- expect_success from p of "$mt.combined_all.$r1t.$r2t.$r3ab"
+ spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "run", "--rerun-all", "$mt:combined_all:$r1t:$r2t:$r3ab" ]
+ expect_success from p of "$mt:checkout_subtree:$r1t:$r2s1"
+ expect_success from p of "$mt:checkout_common_root:$r1t:$r2t"
+ expect_success from p of "$mt:checkout_common_subtree:$r3ab"
+ expect_success from p of "$mt:checkout_common_subtree2:$r1t:$r2s1:$r3abc"
+ expect_success from p of "$mt:combined_all:$r1t:$r2t:$r3ab"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "extract", "$mt.combined_all.$r1t.$r2t.$r3ab.out", "list" ]
+ spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "--repo=r3:./dir_r3", "./main", "extract", "$mt:combined_all:$r1t:$r2t:$r3ab:out", "list" ]
local:
shell on n as list:
cat list
diff --git a/test/script/run.et b/test/script/run.et
index c057a8f..0b61ef4 100644
--- a/test/script/run.et
+++ b/test/script/run.et
@@ -17,7 +17,7 @@ test RunWithoutRepo:
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "--storage=.minici", "${scripts.path}/norepo-basic.yaml", "extract", "block_recipe.out", "." ]
+ spawn on n as p args [ "--storage=.minici", "${scripts.path}/norepo-basic.yaml", "extract", "block_recipe:out", "." ]
local:
shell on n as s:
cat var
@@ -48,13 +48,13 @@ test RunWithRepo:
local:
spawn on n as p args [ "run", "--range=$c0..$c2" ]
expect_result from p:
- of "$t1.success" result "done"
- of "$t1.failure" result "failed"
+ of "$t1:success" result "done"
+ of "$t1:failure" result "failed"
- of "$t2.success" result "done"
- of "$t2.failure" result "failed"
- of "$t2.third" result "done"
- of "$t2.fourth" result "done"
+ of "$t2:success" result "done"
+ of "$t2:failure" result "failed"
+ of "$t2:third" result "done"
+ of "$t2:fourth" result "done"
expect /(.*)/ from p capture done
guard (done == "run-finish")
@@ -62,19 +62,19 @@ test RunWithRepo:
local:
spawn on n as p args [ "./minici.yaml", "run", "--range=$c0..$c2" ]
expect_previous_result from p:
- of "$t1.success" result "done"
+ of "$t1:success" result "done"
expect_result from p:
- of "$t1.failure" result "failed"
- of "$t1.third" result "done"
- of "$t1.fourth" result "done"
+ of "$t1:failure" result "failed"
+ of "$t1:third" result "done"
+ of "$t1:fourth" result "done"
expect_previous_result from p:
- of "$t2.success" result "done"
+ of "$t2:success" result "done"
expect_result from p:
- of "$t2.failure" result "failed"
+ of "$t2:failure" result "failed"
expect_previous_result from p:
- of "$t2.third" result "done"
- of "$t2.fourth" result "done"
+ of "$t2:third" result "done"
+ of "$t2:fourth" result "done"
expect /(.*)/ from p capture done
guard (done == "run-finish")
@@ -118,7 +118,7 @@ test RunExternalRepo:
# Explicit jobfile outside of any git repo
local:
spawn on n as p args [ "--repo=first:./first", "--repo=second:./second", "--storage=.minici", "${scripts.path}/external.yaml", "run", "single", "multiple", "combine" ]
- for job in [ "single.$first_root", "multiple.$first_subtree.$second_subtree", "combine.$first_root.$second_subtree" ]:
+ for job in [ "single:$first_root", "multiple:$first_subtree:$second_subtree", "combine:$first_root:$second_subtree" ]:
expect_success from p of job
expect /(.*)/ from p capture done
@@ -127,15 +127,15 @@ test RunExternalRepo:
# Explicit jobfile within a git repo
local:
spawn on n as p args [ "--repo=first:./first", "--repo=second:./second", "--storage=.minici", "${scripts.path}/external.yaml", "run", "single" ]
- expect_success from p of "single.$first_root"
+ expect_success from p of "single:$first_root"
expect /(.*)/ from p capture done
guard (done == "run-finish")
# Implicit jobfile within a git repo
local:
spawn on n as p args [ "--repo=first:./first", "--repo=second:./second", "./main", "run", "HEAD^..HEAD" ]
- for job in [ "single.$first_root", "multiple.$first_subtree.$second_subtree", "combine.$first_root.$second_subtree" ]:
- expect_success from p of "$main_root.$job"
+ for job in [ "single:$first_root", "multiple:$first_subtree:$second_subtree", "combine:$first_root:$second_subtree" ]:
+ expect_success from p of "$main_root:$job"
expect /(.*)/ from p capture done
guard (done == "run-finish")
@@ -182,12 +182,12 @@ test RunExplicitJob:
expect /([0-9a-f]+)/ from git_init capture t4
local:
- spawn on n as p args [ "./main", "run", "$c1.build" ]
- expect_success from p of "$t1.build"
+ spawn on n as p args [ "./main", "run", "$c1:build" ]
+ expect_success from p of "$t1:build"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "./main", "extract", "$c1.build.out", "list" ]
+ spawn on n as p args [ "./main", "extract", "$c1:build:out", "list" ]
local:
shell on n as s:
cat list
@@ -195,12 +195,12 @@ test RunExplicitJob:
expect /a/ from s
local:
- spawn on n as p args [ "./main", "run", "$t2.build" ]
- expect_success from p of "$t2.build"
+ spawn on n as p args [ "./main", "run", "$t2:build" ]
+ expect_success from p of "$t2:build"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "./main", "extract", "$t2.build.out", "list" ]
+ spawn on n as p args [ "./main", "extract", "$t2:build:out", "list" ]
local:
shell on n as s:
cat list
@@ -208,12 +208,12 @@ test RunExplicitJob:
expect /a b/ from s
local:
- spawn on n as p args [ "./main", "run", "HEAD^.build" ]
- expect_success from p of "$t3.build"
+ spawn on n as p args [ "./main", "run", "HEAD^:build" ]
+ expect_success from p of "$t3:build"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "./main", "extract", "HEAD^.build.out", "list" ]
+ spawn on n as p args [ "./main", "extract", "HEAD^:build:out", "list" ]
local:
shell on n as s:
cat list
@@ -221,12 +221,12 @@ test RunExplicitJob:
expect /c/ from s
local:
- spawn on n as p args [ "./main", "run", "HEAD.build" ]
- expect_success from p of "$t4.build"
+ spawn on n as p args [ "./main", "run", "HEAD:build" ]
+ expect_success from p of "$t4:build"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "./main", "extract", "HEAD.build.out", "list" ]
+ spawn on n as p args [ "./main", "extract", "HEAD:build:out", "list" ]
local:
shell on n as s:
cat list
@@ -307,24 +307,24 @@ test RunExplicitDependentJob:
expect /([0-9a-f]+)/ from git_init capture o4
local:
- spawn on n as p args [ "--repo=other:./other", "./main", "run", "$c1.first", "$t2.first", "$t3.fourth.$o3", "$c1.fifth.$o1", "$c1.fourth.$o1", "$c1.third", "$c1.second", "$t4.fifth.$o4" ]
- expect_success from p of "$t1.first"
- expect_success from p of "$t1.second"
- expect_success from p of "$t1.third"
- expect_success from p of "$t1.fourth.$o1"
- expect_success from p of "$t1.fifth.$o1"
+ spawn on n as p args [ "--repo=other:./other", "./main", "run", "$c1:first", "$t2:first", "$t3:fourth:$o3", "$c1:fifth:$o1", "$c1:fourth:$o1", "$c1:third", "$c1:second", "$t4:fifth:$o4" ]
+ expect_success from p of "$t1:first"
+ expect_success from p of "$t1:second"
+ expect_success from p of "$t1:third"
+ expect_success from p of "$t1:fourth:$o1"
+ expect_success from p of "$t1:fifth:$o1"
- expect_success from p of "$t2.first"
+ expect_success from p of "$t2:first"
- expect_success from p of "$t3.first"
- expect_success from p of "$t3.second"
- expect_success from p of "$t3.fourth.$o3"
+ expect_success from p of "$t3:first"
+ expect_success from p of "$t3:second"
+ expect_success from p of "$t3:fourth:$o3"
- expect_success from p of "$t4.first"
- expect_success from p of "$t4.second"
- expect_success from p of "$t4.third"
- expect_success from p of "$t4.fourth.$o4"
- expect_success from p of "$t4.fifth.$o4"
+ expect_success from p of "$t4:first"
+ expect_success from p of "$t4:second"
+ expect_success from p of "$t4:third"
+ expect_success from p of "$t4:fourth:$o4"
+ expect_success from p of "$t4:fifth:$o4"
flush from p matching /note .*/
flush from p matching /job-duplicate .*/
@@ -346,96 +346,96 @@ test RunRerun:
expect /([0-9a-f]+)/ from git_init capture t1
local:
- spawn on n as p args [ "./main", "run", "$t1.third" ]
- expect_success from p of "$t1.first"
- expect_success from p of "$t1.second"
- expect_result from p of "$t1.first_fail" result "failed"
- expect_skip from p of "$t1.second_skip"
- expect_skip from p of "$t1.third"
+ spawn on n as p args [ "./main", "run", "$t1:third" ]
+ expect_success from p of "$t1:first"
+ expect_success from p of "$t1:second"
+ expect_result from p of "$t1:first_fail" result "failed"
+ expect_skip from p of "$t1:second_skip"
+ expect_skip from p of "$t1:third"
flush from p matching /note .*/
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "./main", "run", "--rerun-explicit", "$t1.second" ]
- expect_previous_success from p of "$t1.first"
- expect_success from p of "$t1.second"
+ spawn on n as p args [ "./main", "run", "--rerun-explicit", "$t1:second" ]
+ expect_previous_success from p of "$t1:first"
+ expect_success from p of "$t1:second"
flush from p matching /note .*/
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "./main", "run", "--rerun-failed", "$t1.second" ]
- expect_previous_success from p of "$t1.first"
- expect_previous_success from p of "$t1.second"
+ spawn on n as p args [ "./main", "run", "--rerun-failed", "$t1:second" ]
+ expect_previous_success from p of "$t1:first"
+ expect_previous_success from p of "$t1:second"
flush from p matching /note .*/
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "./main", "run", "--rerun-all", "$t1.second" ]
- expect_success from p of "$t1.first"
- expect_success from p of "$t1.second"
+ spawn on n as p args [ "./main", "run", "--rerun-all", "$t1:second" ]
+ expect_success from p of "$t1:first"
+ expect_success from p of "$t1:second"
flush from p matching /note .*/
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "./main", "run", "--rerun-none", "$t1.second" ]
- expect_previous_success from p of "$t1.first"
- expect_previous_success from p of "$t1.second"
+ spawn on n as p args [ "./main", "run", "--rerun-none", "$t1:second" ]
+ expect_previous_success from p of "$t1:first"
+ expect_previous_success from p of "$t1:second"
flush from p matching /note .*/
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "./main", "run", "--rerun-explicit", "$t1.third" ]
- expect_previous_success from p of "$t1.first"
- expect_previous_success from p of "$t1.second"
- expect_result from p of "$t1.first_fail" result "failed"
- expect_skip from p of "$t1.second_skip"
- expect_skip from p of "$t1.third"
+ spawn on n as p args [ "./main", "run", "--rerun-explicit", "$t1:third" ]
+ expect_previous_success from p of "$t1:first"
+ expect_previous_success from p of "$t1:second"
+ expect_result from p of "$t1:first_fail" result "failed"
+ expect_skip from p of "$t1:second_skip"
+ expect_skip from p of "$t1:third"
flush from p matching /note .*/
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "./main", "run", "--rerun-failed", "$t1.third" ]
- expect_previous_success from p of "$t1.first"
- expect_previous_success from p of "$t1.second"
- expect_result from p of "$t1.first_fail" result "failed"
- expect_skip from p of "$t1.second_skip"
- expect_skip from p of "$t1.third"
+ spawn on n as p args [ "./main", "run", "--rerun-failed", "$t1:third" ]
+ expect_previous_success from p of "$t1:first"
+ expect_previous_success from p of "$t1:second"
+ expect_result from p of "$t1:first_fail" result "failed"
+ expect_skip from p of "$t1:second_skip"
+ expect_skip from p of "$t1:third"
flush from p matching /note .*/
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "./main", "run", "--rerun-all", "$t1.third" ]
- expect_success from p of "$t1.first"
- expect_success from p of "$t1.second"
- expect_result from p of "$t1.first_fail" result "failed"
- expect_skip from p of "$t1.second_skip"
- expect_skip from p of "$t1.third"
+ spawn on n as p args [ "./main", "run", "--rerun-all", "$t1:third" ]
+ expect_success from p of "$t1:first"
+ expect_success from p of "$t1:second"
+ expect_result from p of "$t1:first_fail" result "failed"
+ expect_skip from p of "$t1:second_skip"
+ expect_skip from p of "$t1:third"
flush from p matching /note .*/
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "./main", "run", "--rerun-none", "$t1.third" ]
- expect_previous_success from p of "$t1.first"
- expect_previous_success from p of "$t1.second"
- expect_previous_result from p of "$t1.first_fail" result "failed"
- expect_skip from p of "$t1.second_skip"
- expect_skip from p of "$t1.third"
+ spawn on n as p args [ "./main", "run", "--rerun-none", "$t1:third" ]
+ expect_previous_success from p of "$t1:first"
+ expect_previous_success from p of "$t1:second"
+ expect_previous_result from p of "$t1:first_fail" result "failed"
+ expect_skip from p of "$t1:second_skip"
+ expect_skip from p of "$t1:third"
flush from p matching /note .*/
expect /(.*)/ from p capture done
@@ -527,81 +527,81 @@ test RunWithManyRepos:
local:
spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r3:./dir_r3", "--repo=r4:./dir_r4", "--repo=r2:./dir_r2", "--repo=r5:./dir_r5", "--destination=d1:./dest1", "./main", "run", "--rerun-all", "first" ]
- expect_success from p of "$mt.first.$r1t.$r2t.$r3t.$r4t"
+ expect_success from p of "$mt:first:$r1t:$r2t:$r3t:$r4t"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r3:./dir_r3", "--repo=r4:./dir_r4", "--repo=r2:./dir_r2", "--repo=r5:./dir_r5", "--destination=d1:./dest1", "./main", "run", "--rerun-all", "$mc.first.$r1c.$r2t.$r3c.$r4t" ]
- expect_success from p of "$mt.first.$r1t.$r2t.$r3t.$r4t"
+ spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r3:./dir_r3", "--repo=r4:./dir_r4", "--repo=r2:./dir_r2", "--repo=r5:./dir_r5", "--destination=d1:./dest1", "./main", "run", "--rerun-all", "$mc:first:$r1c:$r2t:$r3c:$r4t" ]
+ expect_success from p of "$mt:first:$r1t:$r2t:$r3t:$r4t"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r3:./dir_r3", "--repo=r4:./dir_r4", "--repo=r2:./dir_r2", "--repo=r5:./dir_r5", "--destination=d1:./dest1", "./main", "run", "--rerun-all", "first_manual_revision" ]
- expect_success from p of "$mt.first_manual_revision.$r1t.$r2t.$r4t"
+ expect_success from p of "$mt:first_manual_revision:$r1t:$r2t:$r4t"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r3:./dir_r3", "--repo=r4:./dir_r4", "--repo=r2:./dir_r2", "--repo=r5:./dir_r5", "--destination=d1:./dest1", "./main", "run", "--rerun-all", "$mc.first_manual_revision.$r1c.$r2t.$r4t" ]
- expect_success from p of "$mt.first_manual_revision.$r1t.$r2t.$r4t"
+ spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r3:./dir_r3", "--repo=r4:./dir_r4", "--repo=r2:./dir_r2", "--repo=r5:./dir_r5", "--destination=d1:./dest1", "./main", "run", "--rerun-all", "$mc:first_manual_revision:$r1c:$r2t:$r4t" ]
+ expect_success from p of "$mt:first_manual_revision:$r1t:$r2t:$r4t"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r3:./dir_r3", "--repo=r4:./dir_r4", "--repo=r2:./dir_r2", "--repo=r5:./dir_r5", "--destination=d1:./dest1", "./main", "run", "--rerun-all", "dependent" ]
- expect_success from p of "$mt.first.$r1t.$r2t.$r3t.$r4t"
- expect_success from p of "$mt.dependent.$r1t.$r2t.$r3t.$r4t"
+ expect_success from p of "$mt:first:$r1t:$r2t:$r3t:$r4t"
+ expect_success from p of "$mt:dependent:$r1t:$r2t:$r3t:$r4t"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r3:./dir_r3", "--repo=r4:./dir_r4", "--repo=r2:./dir_r2", "--repo=r5:./dir_r5", "--destination=d1:./dest1", "./main", "run", "--rerun-all", "$mc.dependent.$r1c.$r2t.$r3c.$r4t" ]
- expect_success from p of "$mt.first.$r1t.$r2t.$r3t.$r4t"
- expect_success from p of "$mt.dependent.$r1t.$r2t.$r3t.$r4t"
+ spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r3:./dir_r3", "--repo=r4:./dir_r4", "--repo=r2:./dir_r2", "--repo=r5:./dir_r5", "--destination=d1:./dest1", "./main", "run", "--rerun-all", "$mc:dependent:$r1c:$r2t:$r3c:$r4t" ]
+ expect_success from p of "$mt:first:$r1t:$r2t:$r3t:$r4t"
+ expect_success from p of "$mt:dependent:$r1t:$r2t:$r3t:$r4t"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r3:./dir_r3", "--repo=r4:./dir_r4", "--repo=r2:./dir_r2", "--repo=r5:./dir_r5", "--destination=d1:./dest1", "./main", "run", "--rerun-all", "dependent_publish" ]
- expect_success from p of "$mt.first.$r1t.$r2t.$r3t.$r4t"
- expect_success from p of "$mt.dependent_publish.$r1t.$r2t.$r3t.$r4t"
+ expect_success from p of "$mt:first:$r1t:$r2t:$r3t:$r4t"
+ expect_success from p of "$mt:dependent_publish:$r1t:$r2t:$r3t:$r4t"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r3:./dir_r3", "--repo=r4:./dir_r4", "--repo=r2:./dir_r2", "--repo=r5:./dir_r5", "--destination=d1:./dest1", "./main", "run", "--rerun-all", "transitive" ]
- expect_success from p of "$mt.first.$r1t.$r2t.$r3t.$r4t"
- expect_success from p of "$mt.dependent.$r1t.$r2t.$r3t.$r4t"
- expect_success from p of "$mt.transitive.$r1t.$r2t.$r3t.$r4t"
+ expect_success from p of "$mt:first:$r1t:$r2t:$r3t:$r4t"
+ expect_success from p of "$mt:dependent:$r1t:$r2t:$r3t:$r4t"
+ expect_success from p of "$mt:transitive:$r1t:$r2t:$r3t:$r4t"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
- spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r3:./dir_r3", "--repo=r4:./dir_r4", "--repo=r2:./dir_r2", "--repo=r5:./dir_r5", "--destination=d1:./dest1", "./main", "run", "--rerun-all", "$mc.transitive.$r1c.$r2t.$r3c.$r4t" ]
- expect_success from p of "$mt.first.$r1t.$r2t.$r3t.$r4t"
- expect_success from p of "$mt.dependent.$r1t.$r2t.$r3t.$r4t"
- expect_success from p of "$mt.transitive.$r1t.$r2t.$r3t.$r4t"
+ spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r3:./dir_r3", "--repo=r4:./dir_r4", "--repo=r2:./dir_r2", "--repo=r5:./dir_r5", "--destination=d1:./dest1", "./main", "run", "--rerun-all", "$mc:transitive:$r1c:$r2t:$r3c:$r4t" ]
+ expect_success from p of "$mt:first:$r1t:$r2t:$r3t:$r4t"
+ expect_success from p of "$mt:dependent:$r1t:$r2t:$r3t:$r4t"
+ expect_success from p of "$mt:transitive:$r1t:$r2t:$r3t:$r4t"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r3:./dir_r3", "--repo=r4:./dir_r4", "--repo=r2:./dir_r2", "--repo=r5:./dir_r5", "--destination=d1:./dest1", "./main", "run", "--rerun-all", "combined" ]
- expect_success from p of "$mt.first.$r1t.$r2t.$r3t.$r4t"
- expect_success from p of "$mt.second.$r2t.$r3t.$r5t"
- expect_success from p of "$mt.combined.$r1t.$r2t.$r3t.$r4t.$r5t"
+ expect_success from p of "$mt:first:$r1t:$r2t:$r3t:$r4t"
+ expect_success from p of "$mt:second:$r2t:$r3t:$r5t"
+ expect_success from p of "$mt:combined:$r1t:$r2t:$r3t:$r4t:$r5t"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r3:./dir_r3", "--repo=r4:./dir_r4", "--repo=r2:./dir_r2", "--repo=r5:./dir_r5", "--destination=d1:./dest1", "./main", "run", "--rerun-all", "combined_transitive" ]
- expect_success from p of "$mt.first.$r1t.$r2t.$r3t.$r4t"
- expect_success from p of "$mt.second.$r2t.$r3t.$r5t"
- expect_success from p of "$mt.dependent.$r1t.$r2t.$r3t.$r4t"
- expect_success from p of "$mt.transitive.$r1t.$r2t.$r3t.$r4t"
- expect_success from p of "$mt.combined.$r1t.$r2t.$r3t.$r4t.$r5t"
- expect_success from p of "$mt.combined_transitive.$r1t.$r2t.$r3t.$r4t.$r5t"
+ expect_success from p of "$mt:first:$r1t:$r2t:$r3t:$r4t"
+ expect_success from p of "$mt:second:$r2t:$r3t:$r5t"
+ expect_success from p of "$mt:dependent:$r1t:$r2t:$r3t:$r4t"
+ expect_success from p of "$mt:transitive:$r1t:$r2t:$r3t:$r4t"
+ expect_success from p of "$mt:combined:$r1t:$r2t:$r3t:$r4t:$r5t"
+ expect_success from p of "$mt:combined_transitive:$r1t:$r2t:$r3t:$r4t:$r5t"
expect /(.*)/ from p capture done
guard (done == "run-finish")
@@ -610,24 +610,24 @@ test RunWithManyRepos:
local:
spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r3:./dir_r3", "--repo=r4:./dir_r4", "--repo=r2:./dir_r2", "--repo=r5:./dir_r5", "--destination=d1:./dest1", "./main/minici.yaml", "run", "--rerun-all", "first" ]
- expect_success from p of "first.$r1t.$r2t.$r3t.$r4t"
+ expect_success from p of "first:$r1t:$r2t:$r3t:$r4t"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r3:./dir_r3", "--repo=r4:./dir_r4", "--repo=r2:./dir_r2", "--repo=r5:./dir_r5", "--destination=d1:./dest1", "./main/minici.yaml", "run", "--rerun-all", "second" ]
- expect_success from p of "second.$mt.$r2t.$r3t.$r5t"
+ expect_success from p of "second:$mt:$r2t:$r3t:$r5t"
expect /(.*)/ from p capture done
guard (done == "run-finish")
local:
spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r3:./dir_r3", "--repo=r4:./dir_r4", "--repo=r2:./dir_r2", "--repo=r5:./dir_r5", "--destination=d1:./dest1", "./main/minici.yaml", "run", "--rerun-all", "combined_transitive" ]
- expect_success from p of "first.$r1t.$r2t.$r3t.$r4t"
- expect_success from p of "second.$mt.$r2t.$r3t.$r5t"
- expect_success from p of "dependent.$mt.$r1t.$r2t.$r3t.$r4t"
- expect_success from p of "transitive.$mt.$r1t.$r2t.$r3t.$r4t"
- expect_success from p of "combined.$mt.$r1t.$r2t.$r3t.$r4t.$r5t"
- expect_success from p of "combined_transitive.$mt.$r1t.$r2t.$r3t.$r4t.$r5t"
+ expect_success from p of "first:$r1t:$r2t:$r3t:$r4t"
+ expect_success from p of "second:$mt:$r2t:$r3t:$r5t"
+ expect_success from p of "dependent:$mt:$r1t:$r2t:$r3t:$r4t"
+ expect_success from p of "transitive:$mt:$r1t:$r2t:$r3t:$r4t"
+ expect_success from p of "combined:$mt:$r1t:$r2t:$r3t:$r4t:$r5t"
+ expect_success from p of "combined_transitive:$mt:$r1t:$r2t:$r3t:$r4t:$r5t"
expect /(.*)/ from p capture done
guard (done == "run-finish")
@@ -696,9 +696,9 @@ test WatchBranchAndCancel:
git reset --hard $ca
expect from p:
- /job-start $ta.first/
- /job-start $ta.third/
- /job-finish $ta.third done/
+ /job-start $ta:first/
+ /job-start $ta:third/
+ /job-finish $ta:third done/
shell on n:
git reset --hard $cc
@@ -710,26 +710,26 @@ test WatchBranchAndCancel:
git reset --hard $ce
expect from p:
- /job-finish $tb.first cancelled/
- /job-finish $tb.second cancelled/
- /job-finish $tc.first cancelled/
- /job-finish $tc.second cancelled/
- /job-finish $tc.third cancelled/
+ /job-finish $tb:first cancelled/
+ /job-finish $tb:second cancelled/
+ /job-finish $tc:first cancelled/
+ /job-finish $tc:second cancelled/
+ /job-finish $tc:third cancelled/
for commit in [ ta ]:
- spawn on n as log args [ "log", "$commit.first" ]
+ spawn on n as log args [ "log", "$commit:first" ]
expect from log /msg (.*)/ capture path
shell on n:
echo -n > $path
- expect from p /job-finish $commit.first done/
+ expect from p /job-finish $commit:first done/
for commit in [ td, te ]:
- expect from p /job-start $commit.first/
- spawn on n as log args [ "log", "$commit.first" ]
+ expect from p /job-start $commit:first/
+ spawn on n as log args [ "log", "$commit:first" ]
expect from log /msg (.*)/ capture path
shell on n:
echo -n > $path
- expect from p /job-finish $commit.first done/
+ expect from p /job-finish $commit:first done/
test RestartCancelledJobs:
@@ -790,76 +790,76 @@ test RestartCancelledJobs:
git reset --hard $ca
expect from p:
- /job-enqueue $ta.first/
- /job-enqueue $ta.second/
- /job-enqueue $ta.third/
- /job-start $ta.first/
- /job-start $ta.third/
- /job-finish $ta.third done/
+ /job-enqueue $ta:first/
+ /job-enqueue $ta:second/
+ /job-enqueue $ta:third/
+ /job-start $ta:first/
+ /job-start $ta:third/
+ /job-finish $ta:third done/
shell on n:
git reset --hard $cc
expect from p:
- /job-enqueue $tb.first/
- /job-enqueue $tb.second/
- /job-enqueue $tb.third/
- /job-enqueue $tc.first/
- /job-enqueue $tc.second/
- /job-enqueue $tc.third/
- /job-start $tb.first/
- /job-start $tb.third/
- /job-start $tc.first/
- /job-start $tc.third/
- /job-finish $tb.third done/
- /job-finish $tc.third done/
+ /job-enqueue $tb:first/
+ /job-enqueue $tb:second/
+ /job-enqueue $tb:third/
+ /job-enqueue $tc:first/
+ /job-enqueue $tc:second/
+ /job-enqueue $tc:third/
+ /job-start $tb:first/
+ /job-start $tb:third/
+ /job-start $tc:first/
+ /job-start $tc:third/
+ /job-finish $tb:third done/
+ /job-finish $tc:third done/
shell on n:
git reset --hard $ca
expect from p:
- /job-finish $tb.first cancelled/
- /job-finish $tb.second cancelled/
- /job-finish $tc.first cancelled/
- /job-finish $tc.second cancelled/
+ /job-finish $tb:first cancelled/
+ /job-finish $tb:second cancelled/
+ /job-finish $tc:first cancelled/
+ /job-finish $tc:second cancelled/
shell on n:
git reset --hard $cb
expect from p:
- /job-enqueue $tb.first/
- /job-enqueue $tb.second/
- /job-duplicate $tb.third done/
- /job-start $tb.first/
+ /job-enqueue $tb:first/
+ /job-enqueue $tb:second/
+ /job-duplicate $tb:third done/
+ /job-start $tb:first/
shell on n:
git reset --hard $ca
expect from p:
- /job-finish $tb.first cancelled/
- /job-finish $tb.second cancelled/
+ /job-finish $tb:first cancelled/
+ /job-finish $tb:second cancelled/
shell on n:
git reset --hard $cd
expect from p:
- /job-enqueue $tb.first/
- /job-enqueue $tb.second/
- /job-duplicate $tb.third done/
- /job-start $tb.first/
-
- /job-enqueue $tc.first/
- /job-enqueue $tc.second/
- /job-duplicate $tc.third done/
- /job-start $tc.first/
-
- /job-enqueue $td.first/
- /job-enqueue $td.second/
- /job-enqueue $td.third/
- /job-start $td.first/
- /job-start $td.third/
+ /job-enqueue $tb:first/
+ /job-enqueue $tb:second/
+ /job-duplicate $tb:third done/
+ /job-start $tb:first/
+
+ /job-enqueue $tc:first/
+ /job-enqueue $tc:second/
+ /job-duplicate $tc:third done/
+ /job-start $tc:first/
+
+ /job-enqueue $td:first/
+ /job-enqueue $td:second/
+ /job-enqueue $td:third/
+ /job-start $td:first/
+ /job-start $td:third/
/job-(.*)/ capture final_job
- guard (final_job == "finish $td.third done")
+ guard (final_job == "finish $td:third done")
test RangeExpressions:
@@ -923,36 +923,36 @@ test RangeExpressions:
local:
spawn on n as p args [ "run", "--rerun-all", "$ce:" ] killwith SIGINT
expect from p:
- /job-enqueue $te.single/
- /job-start $te.single/
- /job-finish $te.single done/
+ /job-enqueue $te:single/
+ /job-start $te:single/
+ /job-finish $te:single done/
expect /(.*)/ from p capture finish
guard (finish == "run-finish")
local:
spawn on n as p args [ "run", "--rerun-all", "$cb..$cd" ] killwith SIGINT
expect from p:
- /job-enqueue $tc.single/
- /job-start $tc.single/
- /job-finish $tc.single done/
- /job-enqueue $td.single/
- /job-start $td.single/
- /job-finish $td.single done/
+ /job-enqueue $tc:single/
+ /job-start $tc:single/
+ /job-finish $tc:single done/
+ /job-enqueue $td:single/
+ /job-start $td:single/
+ /job-finish $td:single done/
expect /(.*)/ from p capture finish
guard (finish == "run-finish")
local:
spawn on n as p args [ "run", "--rerun-all", "master..$cc" ] killwith SIGINT
expect from p:
- /job-enqueue $ta.single/
- /job-start $ta.single/
- /job-finish $ta.single done/
- /job-enqueue $tb.single/
- /job-start $tb.single/
- /job-finish $tb.single done/
- /job-enqueue $tc.single/
- /job-start $tc.single/
- /job-finish $tc.single done/
+ /job-enqueue $ta:single/
+ /job-start $ta:single/
+ /job-finish $ta:single done/
+ /job-enqueue $tb:single/
+ /job-start $tb:single/
+ /job-finish $tb:single done/
+ /job-enqueue $tc:single/
+ /job-start $tc:single/
+ /job-finish $tc:single done/
expect /(.*)/ from p capture finish
guard (finish == "run-finish")
@@ -963,9 +963,9 @@ test RangeExpressions:
spawn on n as p args [ "run", "--rerun-all", "watch(master)" ] killwith SIGINT
expect from p:
- /job-enqueue $ta.single/
- /job-start $ta.single/
- /job-finish $ta.single done/
+ /job-enqueue $ta:single/
+ /job-start $ta:single/
+ /job-finish $ta:single done/
local:
shell on n:
@@ -973,7 +973,7 @@ test RangeExpressions:
expect from p:
/job-enqueue (.*)/ capture td_single
- guard (td_single == "$td.single")
+ guard (td_single == "$td:single")
expect from p:
/job-start $td_single/
/job-finish $td_single done/
@@ -984,7 +984,7 @@ test RangeExpressions:
expect from p:
/job-enqueue (.*)/ capture tb_single
- guard (tb_single == "$tb.single")
+ guard (tb_single == "$tb:single")
expect from p:
/job-start $tb_single/
/job-finish $tb_single done/
@@ -1000,19 +1000,19 @@ test RangeExpressions:
shell on n:
git reset --hard $cb
expect from p:
- /job-enqueue $ta.single/
- /job-start $ta.single/
- /job-finish $ta.single done/
- /job-enqueue $tb.single/
- /job-start $tb.single/
- /job-finish $tb.single done/
+ /job-enqueue $ta:single/
+ /job-start $ta:single/
+ /job-finish $ta:single done/
+ /job-enqueue $tb:single/
+ /job-start $tb:single/
+ /job-finish $tb:single done/
shell on n:
git reset --hard $cd
expect from p:
- /job-enqueue $tc.single/
- /job-start $tc.single/
- /job-finish $tc.single done/
- /job-enqueue $td.single/
- /job-start $td.single/
- /job-finish $td.single done/
+ /job-enqueue $tc:single/
+ /job-start $tc:single/
+ /job-finish $tc:single done/
+ /job-enqueue $td:single/
+ /job-start $td:single/
+ /job-finish $td:single done/
diff --git a/test/script/shell.et b/test/script/shell.et
index c3a2282..9a2de24 100644
--- a/test/script/shell.et
+++ b/test/script/shell.et
@@ -33,7 +33,7 @@ test ShellPrepare:
expect /run-finish/ from p
local:
- spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "${scripts.path}/minici.yaml", "shell", "combine.$r1t.$r2t" ]
+ spawn on n as p args [ "--storage=minici", "--repo=r1:./dir_r1", "--repo=r2:./dir_r2", "${scripts.path}/minici.yaml", "shell", "combine:$r1t:$r2t" ]
with p:
send "ls ."
expect /d1/
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-19 11:22:16 +0000