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 =
, lib.qmcPackDir ++ "/simple-H2O.xml"
]
⫽ argIfTest isTest
⫽ { cmdavoids = [ "Error", "error", "ERROR" ] }
)
, lammps =
λ(isTest : Bool)
......@@ -45,6 +46,7 @@ in let apps =
, lib.lammpsDir ++ "/modified.lj"
]
⫽ argIfTest isTest
⫽ { cmdavoids = [ "Error", "error", "ERROR" ] }
)
, openmc =
λ(isTest : Bool)
......@@ -53,9 +55,15 @@ in let apps =
"mpiexec"
[ "-n", if isTest then "2" else "24", "openmc" ]
⫽ 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 =
λ(isTest : Bool)
→ lib.progressAppTest
......@@ -79,7 +87,7 @@ in let apps =
⫽ { vars =
[ { varname = "OMP_NUM_THREADS", value = "1" } ]
, cmdavoids =
[ "Error" ]
[ "Error", "error", "ERROR" ]
}
)
, stream =
......@@ -95,6 +103,8 @@ in let apps =
}
, { varname = "OMP_PLACES", value = "cores" }
]
, cmdavoids =
[ "Error", "error", "ERROR" ]
}
)
}
......
......@@ -42,7 +42,7 @@ in let basicCommand =
{ filename =
"${args.outprefix}.err"
, filecheck =
values.emptyCheck
values.emptyCheck ⫽ { avoids = args.outavoids }
}
, postchecks =
[] : List types.FileCheck
......
......@@ -391,7 +391,16 @@ let
testQMCPack = doDhrun (test.overrideAttrs
(old:{buildInputs=old.buildInputs++[ qmcpack ];})) "qmcpack";
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
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