Commit ef4da2ab authored by Valentin Reis's avatar Valentin Reis
Browse files

worked on dhrun tests.

parent 727c6d09
...@@ -30,6 +30,7 @@ in let apps = ...@@ -30,6 +30,7 @@ in let apps =
, lib.qmcPackDir ++ "/simple-H2O.xml" , lib.qmcPackDir ++ "/simple-H2O.xml"
] ]
⫽ argIfTest isTest ⫽ argIfTest isTest
⫽ { cmdavoids = [ "Error", "error", "ERROR" ] }
) )
, lammps = , lammps =
λ(isTest : Bool) λ(isTest : Bool)
...@@ -45,6 +46,7 @@ in let apps = ...@@ -45,6 +46,7 @@ in let apps =
, lib.lammpsDir ++ "/modified.lj" , lib.lammpsDir ++ "/modified.lj"
] ]
⫽ argIfTest isTest ⫽ argIfTest isTest
⫽ { cmdavoids = [ "Error", "error", "ERROR" ] }
) )
, openmc = , openmc =
λ(isTest : Bool) λ(isTest : Bool)
...@@ -53,9 +55,15 @@ in let apps = ...@@ -53,9 +55,15 @@ in let apps =
"mpiexec" "mpiexec"
[ "-n", if isTest then "2" else "24", "openmc" ] [ "-n", if isTest then "2" else "24", "openmc" ]
⫽ argIfTest isTest ⫽ argIfTest isTest
⫽ { passvars = [ "OPENMC_CROSS_SECTIONS" ] } ⫽ { passvars =
[ "OPENMC_CROSS_SECTIONS" ]
, cmdavoids =
[ "Error", "error", "ERROR" ]
}
) )
⫽ { pre = [ "cp -r " ++ lib.openmcDir ++ " ." ] } ⫽ { pre =
[ "cp --no-preserve=mode -r " ++ lib.openmcDir ++ "/* ." ]
}
, amg = , amg =
λ(isTest : Bool) λ(isTest : Bool)
→ lib.progressAppTest → lib.progressAppTest
...@@ -79,7 +87,7 @@ in let apps = ...@@ -79,7 +87,7 @@ in let apps =
⫽ { vars = ⫽ { vars =
[ { varname = "OMP_NUM_THREADS", value = "1" } ] [ { varname = "OMP_NUM_THREADS", value = "1" } ]
, cmdavoids = , cmdavoids =
[ "Error" ] [ "Error", "error", "ERROR" ]
} }
) )
, stream = , stream =
...@@ -95,6 +103,8 @@ in let apps = ...@@ -95,6 +103,8 @@ in let apps =
} }
, { varname = "OMP_PLACES", value = "cores" } , { varname = "OMP_PLACES", value = "cores" }
] ]
, cmdavoids =
[ "Error", "error", "ERROR" ]
} }
) )
} }
......
...@@ -42,7 +42,7 @@ in let basicCommand = ...@@ -42,7 +42,7 @@ in let basicCommand =
{ filename = { filename =
"${args.outprefix}.err" "${args.outprefix}.err"
, filecheck = , filecheck =
values.emptyCheck values.emptyCheck ⫽ { avoids = args.outavoids }
} }
, postchecks = , postchecks =
[] : List types.FileCheck [] : List types.FileCheck
......
...@@ -391,7 +391,16 @@ let ...@@ -391,7 +391,16 @@ let
testQMCPack = doDhrun (test.overrideAttrs testQMCPack = doDhrun (test.overrideAttrs
(old:{buildInputs=old.buildInputs++[ qmcpack ];})) "qmcpack"; (old:{buildInputs=old.buildInputs++[ qmcpack ];})) "qmcpack";
testAll = doDhrun (test.overrideAttrs testAll = doDhrun (test.overrideAttrs
(old:{OPENMC_CROSS_SECTIONS = "${openmc-data}/cross_sections.xml";})) "tests"; (old:{
buildInputs = old.buildInputs ++ [
lammps
qmcpack
openmc
stream
amg
openmc-data
];
OPENMC_CROSS_SECTIONS = "${openmc-data}/cross_sections.xml";})) "tests";
}; };
# re-exporting a full nixpkgs-like package set # re-exporting a full nixpkgs-like package set
in pkgs // argopkgs in pkgs // argopkgs
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