Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
argo
argopkgs
Commits
f2fe1567
Commit
f2fe1567
authored
Apr 16, 2019
by
Valentin Reis
Browse files
updates dhall code for new dhrun version
parent
3e4ce8bb
Pipeline
#6384
passed with stages
in 8 minutes and 2 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
dhrun/all-tests.dh
View file @
f2fe1567
...
...
@@ -6,17 +6,30 @@ in let cn = "testContainer"
in let basicManifest = lib.argopkgsManifestDirPath ++ "basic.json"
in let argIfTest =
λ(isTest : Bool)
→ { isTest =
isTest
, timeout =
if isTest
then [ 60 ] : Optional Natural
else [] : Optional Natural
}
in let apps =
{ qmcpack =
λ(isTest : Bool)
→ lib.progressAppTest
( lib.emptyProgressAppTestArg
"mpiexec"
[ "-n"
, if isTest then "2" else "24"
, "qmcpack"
, lib.qmcPackDir ++ "/simple-H2O.xml"
]
( lib.emptyProgressAppTestArg
"mpiexec"
[ "-n"
, if isTest then "2" else "24"
, "qmcpack"
, lib.qmcPackDir ++ "/simple-H2O.xml"
]
⫽ argIfTest isTest
)
, lammps =
λ(isTest : Bool)
...
...
@@ -31,7 +44,7 @@ in let apps =
, "-i"
, lib.lammpsDir ++ "/modified.lj"
]
⫽
{ is
Test
=
isTest
}
⫽
argIf
Test isTest
)
, openmc =
λ(isTest : Bool)
...
...
@@ -39,7 +52,7 @@ in let apps =
( lib.emptyProgressAppTestArg
"mpiexec"
[ "-n", if isTest then "2" else "24", "openmc" ]
⫽
{ is
Test
=
isTest
}
⫽
argIf
Test isTest
)
⫽ { pre = [ "cp -r \$OPENMC_PWD/* ." ] }
, amg =
...
...
@@ -61,16 +74,14 @@ in let apps =
, "12"
, "1"
]
⫽ { vars =
[ { varname = "OMP_NUM_THREADS", value = "1" } ]
, isTest =
isTest
}
⫽ argIfTest isTest
⫽ { vars = [ { varname = "OMP_NUM_THREADS", value = "1" } ] }
)
, stream =
λ(isTest : Bool)
→ lib.progressAppTest
( lib.emptyProgressAppTestArg "stream_c" ([] : List Text)
⫽ argIfTest isTest
⫽ { vars =
[ { varname =
"OMP_NUM_THREADS"
...
...
@@ -79,8 +90,6 @@ in let apps =
}
, { varname = "OMP_PLACES", value = "cores" }
]
, isTest =
isTest
}
)
}
...
...
@@ -88,12 +97,28 @@ in let apps =
in { hello =
lib.makeBase
( lib.emptyMakeBaseArgs "echo" basicManifest cn
⫽ { args = [ message ], verbose = True, cmdwants = [ message ] }
⫽ { args =
[ message ]
, verbose =
True
, cmdwants =
[ message ]
, timeout =
[ 60 ] : Optional Natural
}
)
, listen =
lib.makeExtended
( lib.emptyMakeBaseArgs "sleep" basicManifest cn
⫽ { args = [ "1" ], verbose = True, cmdwants = [] : List Text }
⫽ { args =
[ "1" ]
, verbose =
True
, cmdwants =
[] : List Text
, timeout =
[ 60 ] : Optional Natural
}
)
[ lib.values.emptyCmd
{ name =
...
...
@@ -106,9 +131,15 @@ in { hello =
⫽ { args = [ "listen", "-u", cn ] }
]
, power =
lib.appTest (lib.emptyFilterTestArgs "power")
lib.appTest
( lib.emptyFilterTestArgs "power"
⫽ { timeout = [ 60 ] : Optional Natural }
)
, performance =
lib.appTest (lib.emptyFilterTestArgs "performance")
lib.appTest
( lib.emptyFilterTestArgs "performance"
⫽ { timeout = [ 60 ] : Optional Natural }
)
, stream =
apps.stream True
, openmc =
...
...
dhrun/lib.dh
View file @
f2fe1567
...
...
@@ -33,6 +33,8 @@ in let basicCommand =
values.emptyVars
, passvars =
[ "PATH" ]
, timeout =
[] : Optional Natural
}
in let MakeBaseArgs =
...
...
@@ -50,6 +52,8 @@ in let MakeBaseArgs =
List Text
, vars :
List types.EnvVar
, timeout :
Optional Natural
}
in let emptyMakeBaseArgs =
...
...
@@ -113,6 +117,8 @@ in let makeBase =
# args.args
, passvars =
[ "PATH" ]
, timeout =
args.timeout
}
]
, verbosity =
...
...
@@ -144,6 +150,8 @@ in let FilterTestArgs =
List types.EnvVar
, isTest :
Bool
, timeout :
Optional Natural
}
in let emptyFilterTestArgs =
...
...
@@ -158,6 +166,8 @@ in let emptyFilterTestArgs =
values.emptyVars
, isTest =
False
, timeout =
[] : Optional Natural
}
in let sleepArgs =
...
...
@@ -190,6 +200,8 @@ in let appTest =
[] : List Text
, vars =
args.vars
, timeout =
args.timeout
}
[ let b =
values.emptyCmd
...
...
@@ -228,6 +240,8 @@ in let ProgressAppTestArg =
List types.EnvVar
, isTest :
Bool
, timeout :
Optional Natural
}
in let emptyProgressAppTestArg =
...
...
@@ -241,6 +255,8 @@ in let emptyProgressAppTestArg =
[] : List types.EnvVar
, isTest =
False
, timeout =
[] : Optional Natural
}
: ProgressAppTestArg
...
...
@@ -256,6 +272,8 @@ in let progressAppTest =
args.vars
, isTest =
False
, timeout =
args.timeout
}
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment