Commit 4e9321e6 authored by Valentin Reis's avatar Valentin Reis

dhrun changes

parent 4a425bbd
Pipeline #7379 failed with stages
in 36 minutes and 49 seconds
......@@ -6,6 +6,6 @@
"cpus": 2,
"mems": 1
},
perfwrapper: true
"perfwrapper": true
}
}
......@@ -411,7 +411,7 @@ let
'';
});
dhrunSpecs = pkgs.stdenv.mkDerivation rec {
dhrunTestConfigLayer = pkgs.stdenv.mkDerivation rec {
name = "dhrunSpecs";
src = ../dhrun ;
installPhase = ''
......@@ -432,45 +432,23 @@ let
unpackPhase = "true";
};
doDhrun = dhrscript: test.overrideAttrs (old:{
doDhrun = dhallcall: test.overrideAttrs (old:{
buildPhase = ''
cat $DHRUNSCRIPT | dhall resolve | dhall normalize | dhall-to-yaml | dhrun run "-"
dhrun run <<< 'let all = ${dhrunTestConfigLayer}/all-tests.dh
"${dhrunTestConfigLayer}/" in all.${dhallcall}'
'';
buildInputs = old.buildInputs ++ [
dhall-json
pkgs.yq
dhall
];
DHRUNSCRIPT = "${dhrscript}";
DHRUNSPECS = "${dhrunSpecs}";
installPhase = ''
mkdir -p $out
cp _output/* $out/
'';
});
doDhrunApp = app :
let
dhrunscript = pkgs.writeText "test.dhall" ''
let all = ${dhrunSpecs}/all-tests.dh "${dhrunSpecs}/"
in all.${app} True < NoCap = {=} | Cap : Text >
'';
in
doDhrun dhrunscript;
doDhrunKey = key:
let
dhrunscript = pkgs.writeText "test.dhall" ''
let all = ${dhrunSpecs}/all-tests.dh "${dhrunSpecs}/" in all.${key}
'';
in
doDhrun dhrunscript;
testGeneric = doDhrunKey genericTestName;
testSingularity = (doDhrunKey "run-singularity").overrideAttrs (o:{
__noChroot = true; # singularity needs an OS-based install.
testGeneric = doDhrun genericTestName;
testSingularity = (doDhrun "run-singularity").overrideAttrs (o:{
__noChroot = true; # the test needs OS singularity installation so we disable sanboxing here.
});
doDhrunApp = app : doDhrun "${app} True < NoCap = {=} | Cap : Text >";
testSTREAM = addBI (doDhrunApp "stream") stream;
testAMG = addBI (doDhrunApp "amg") amg;
testOpenMC = (addBI (doDhrunApp "openmc") openmc).overrideAttrs
......@@ -478,7 +456,7 @@ let
testLAMMPS = addBI (doDhrunApp "lammps") lammps;
testQMCPack = addBI (doDhrunApp "qmcpack") qmcpack ;
testAll = (doDhrunKey "hello").overrideAttrs
testAll = (doDhrun "hello").overrideAttrs
(old:{
buildInputs = old.buildInputs ++ [
lammps
......
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