Commit 4f9defc4 authored by Valentin Reis's avatar Valentin Reis
Browse files

dhrun code fix

parent 6ede7ea3
Pipeline #6416 failed with stages
in 31 seconds
......@@ -72,11 +72,15 @@ in let apps =
, "90"
, "-P"
, "2"
, "12"
, if isTest then "1" else "12"
, "1"
]
⫽ argIfTest isTest
⫽ { vars = [ { varname = "OMP_NUM_THREADS", value = "1" } ] }
⫽ { vars =
[ { varname = "OMP_NUM_THREADS", value = "1" } ]
, cmdavoids =
[ "Error" ]
}
)
, stream =
λ(isTest : Bool)
......@@ -104,6 +108,8 @@ in { hello =
True
, cmdwants =
[ message ]
, cmdavoids =
[ "Traceback" ]
, timeout =
[ 60 ] : Optional Natural
}
......@@ -117,6 +123,8 @@ in { hello =
True
, cmdwants =
[] : List Text
, cmdavoids =
[ "Traceback" ]
, timeout =
[ 60 ] : Optional Natural
}
......
......@@ -17,7 +17,17 @@ in let lammpsDir = assetDir
in let qmcPackDir = assetDir
in let basicCommand =
λ(args : { name : Text, outprefix : Text, outwants : List Text })
λ ( args
: { name :
Text
, outprefix :
Text
, outwants :
List Text
, outavoids :
List Text
}
)
→ { name =
args.name
, args =
......@@ -26,7 +36,7 @@ in let basicCommand =
{ filename =
"${args.outprefix}.out"
, filecheck =
values.emptyCheck ⫽ { wants = args.outwants }
{ wants = args.outwants, avoids = args.outavoids }
}
, err =
{ filename =
......@@ -57,6 +67,8 @@ in let MakeBaseArgs =
Bool
, cmdwants :
List Text
, cmdavoids :
List Text
, vars :
List types.EnvVar
, passvars :
......@@ -81,6 +93,8 @@ in let emptyMakeBaseArgs =
False
, cmdwants =
[] : List Text
, cmdavoids =
[] : List Text
, vars =
values.emptyVars
, passvars =
......@@ -99,9 +113,11 @@ in let makeBase =
"daemon"
, outwants =
[] : List Text
, outavoids =
[ "Traceback" ] : List Text
}
⫽ { args =
["--nrm_log","./nrm_log"] # addVerbose args.verbose
[ "--nrm_log", "./nrm_log" ] # addVerbose args.verbose
, vars =
[ { varname =
"ARGO_NODEOS_CONFIG"
......@@ -118,6 +134,8 @@ in let makeBase =
"cmdrun"
, outwants =
args.cmdwants
, outavoids =
args.cmdavoids
}
in b
......@@ -164,6 +182,8 @@ in let FilterTestArgs =
List types.EnvVar
, passvars :
List Text
, cmdavoids :
List Text
, isTest :
Bool
, timeout :
......@@ -183,6 +203,8 @@ in let emptyFilterTestArgs =
values.emptyVars
, passvars =
[] : List Text
, cmdavoids =
[] : List Text
, isTest =
False
, timeout =
......@@ -206,6 +228,8 @@ in let appTest =
True
, cmdwants =
[] : List Text
, cmdavoids =
args.cmdavoids
, vars =
args.vars
, passvars =
......@@ -250,6 +274,8 @@ in let ProgressAppTestArg =
List types.EnvVar
, passvars :
List Text
, cmdavoids :
List Text
, isTest :
Bool
, timeout :
......@@ -267,6 +293,8 @@ in let emptyProgressAppTestArg =
[] : List types.EnvVar
, passvars =
[] : List Text
, cmdavoids =
[] : List Text
, isTest =
False
, timeout =
......@@ -284,6 +312,8 @@ in let progressAppTest =
args.vars
, passvars =
args.passvars
, cmdavoids =
args.cmdavoids
, isTest =
True
, timeout =
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment