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 = ...@@ -72,11 +72,15 @@ in let apps =
, "90" , "90"
, "-P" , "-P"
, "2" , "2"
, "12" , if isTest then "1" else "12"
, "1" , "1"
] ]
⫽ argIfTest isTest ⫽ argIfTest isTest
⫽ { vars = [ { varname = "OMP_NUM_THREADS", value = "1" } ] } ⫽ { vars =
[ { varname = "OMP_NUM_THREADS", value = "1" } ]
, cmdavoids =
[ "Error" ]
}
) )
, stream = , stream =
λ(isTest : Bool) λ(isTest : Bool)
...@@ -104,6 +108,8 @@ in { hello = ...@@ -104,6 +108,8 @@ in { hello =
True True
, cmdwants = , cmdwants =
[ message ] [ message ]
, cmdavoids =
[ "Traceback" ]
, timeout = , timeout =
[ 60 ] : Optional Natural [ 60 ] : Optional Natural
} }
...@@ -117,6 +123,8 @@ in { hello = ...@@ -117,6 +123,8 @@ in { hello =
True True
, cmdwants = , cmdwants =
[] : List Text [] : List Text
, cmdavoids =
[ "Traceback" ]
, timeout = , timeout =
[ 60 ] : Optional Natural [ 60 ] : Optional Natural
} }
......
...@@ -17,7 +17,17 @@ in let lammpsDir = assetDir ...@@ -17,7 +17,17 @@ in let lammpsDir = assetDir
in let qmcPackDir = assetDir in let qmcPackDir = assetDir
in let basicCommand = in let basicCommand =
λ(args : { name : Text, outprefix : Text, outwants : List Text }) λ ( args
: { name :
Text
, outprefix :
Text
, outwants :
List Text
, outavoids :
List Text
}
)
→ { name = → { name =
args.name args.name
, args = , args =
...@@ -26,7 +36,7 @@ in let basicCommand = ...@@ -26,7 +36,7 @@ in let basicCommand =
{ filename = { filename =
"${args.outprefix}.out" "${args.outprefix}.out"
, filecheck = , filecheck =
values.emptyCheck ⫽ { wants = args.outwants } { wants = args.outwants, avoids = args.outavoids }
} }
, err = , err =
{ filename = { filename =
...@@ -57,6 +67,8 @@ in let MakeBaseArgs = ...@@ -57,6 +67,8 @@ in let MakeBaseArgs =
Bool Bool
, cmdwants : , cmdwants :
List Text List Text
, cmdavoids :
List Text
, vars : , vars :
List types.EnvVar List types.EnvVar
, passvars : , passvars :
...@@ -81,6 +93,8 @@ in let emptyMakeBaseArgs = ...@@ -81,6 +93,8 @@ in let emptyMakeBaseArgs =
False False
, cmdwants = , cmdwants =
[] : List Text [] : List Text
, cmdavoids =
[] : List Text
, vars = , vars =
values.emptyVars values.emptyVars
, passvars = , passvars =
...@@ -99,9 +113,11 @@ in let makeBase = ...@@ -99,9 +113,11 @@ in let makeBase =
"daemon" "daemon"
, outwants = , outwants =
[] : List Text [] : List Text
, outavoids =
[ "Traceback" ] : List Text
} }
⫽ { args = ⫽ { args =
["--nrm_log","./nrm_log"] # addVerbose args.verbose [ "--nrm_log", "./nrm_log" ] # addVerbose args.verbose
, vars = , vars =
[ { varname = [ { varname =
"ARGO_NODEOS_CONFIG" "ARGO_NODEOS_CONFIG"
...@@ -118,6 +134,8 @@ in let makeBase = ...@@ -118,6 +134,8 @@ in let makeBase =
"cmdrun" "cmdrun"
, outwants = , outwants =
args.cmdwants args.cmdwants
, outavoids =
args.cmdavoids
} }
in b in b
...@@ -164,6 +182,8 @@ in let FilterTestArgs = ...@@ -164,6 +182,8 @@ in let FilterTestArgs =
List types.EnvVar List types.EnvVar
, passvars : , passvars :
List Text List Text
, cmdavoids :
List Text
, isTest : , isTest :
Bool Bool
, timeout : , timeout :
...@@ -183,6 +203,8 @@ in let emptyFilterTestArgs = ...@@ -183,6 +203,8 @@ in let emptyFilterTestArgs =
values.emptyVars values.emptyVars
, passvars = , passvars =
[] : List Text [] : List Text
, cmdavoids =
[] : List Text
, isTest = , isTest =
False False
, timeout = , timeout =
...@@ -206,6 +228,8 @@ in let appTest = ...@@ -206,6 +228,8 @@ in let appTest =
True True
, cmdwants = , cmdwants =
[] : List Text [] : List Text
, cmdavoids =
args.cmdavoids
, vars = , vars =
args.vars args.vars
, passvars = , passvars =
...@@ -250,6 +274,8 @@ in let ProgressAppTestArg = ...@@ -250,6 +274,8 @@ in let ProgressAppTestArg =
List types.EnvVar List types.EnvVar
, passvars : , passvars :
List Text List Text
, cmdavoids :
List Text
, isTest : , isTest :
Bool Bool
, timeout : , timeout :
...@@ -267,6 +293,8 @@ in let emptyProgressAppTestArg = ...@@ -267,6 +293,8 @@ in let emptyProgressAppTestArg =
[] : List types.EnvVar [] : List types.EnvVar
, passvars = , passvars =
[] : List Text [] : List Text
, cmdavoids =
[] : List Text
, isTest = , isTest =
False False
, timeout = , timeout =
...@@ -284,6 +312,8 @@ in let progressAppTest = ...@@ -284,6 +312,8 @@ in let progressAppTest =
args.vars args.vars
, passvars = , passvars =
args.passvars args.passvars
, cmdavoids =
args.cmdavoids
, isTest = , isTest =
True True
, timeout = , 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