Use local ovni for tests
This commit is contained in:
parent
cec52ada83
commit
778c119bd6
24
nix/rt.nix
24
nix/rt.nix
@ -23,8 +23,10 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
ovni-local = last.callPackage ./ovni.nix { };
|
||||
|
||||
# Build ovni with old gcc versions
|
||||
genOldOvni = stdenv: (last.ovni.override {
|
||||
genOldOvni = stdenv: (last.ovni-local.override {
|
||||
stdenv = stdenv;
|
||||
}).overrideAttrs (old: {
|
||||
pname = old.name + "@" + stdenv.cc.cc.version;
|
||||
@ -60,10 +62,15 @@ let
|
||||
|
||||
oldOvnisRelease = map last.genOldOvniRelease last.oldCompilers;
|
||||
|
||||
ovni-nompi = last.ovni-local.overrideAttrs (old: {
|
||||
buildInputs = pkgs.lib.filter (x: x != last.mpi ) old.buildInputs;
|
||||
cmakeFlags = old.cmakeFlags ++ [ "-DUSE_MPI=OFF" ];
|
||||
});
|
||||
|
||||
# Now we rebuild ovni with the Nanos6 and nOS-V versions, which were
|
||||
# linked to the previous ovni. We need to be able to exit the chroot
|
||||
# to run Nanos6 tests, as they require access to /sys for hwloc
|
||||
ovni-rt = (last.ovni.override {
|
||||
ovni-rt = (last.ovni-local.override {
|
||||
stdenv = last.stdenvClangOmpss2;
|
||||
}).overrideAttrs (old: {
|
||||
__noChroot = true;
|
||||
@ -75,15 +82,10 @@ let
|
||||
last.nodes
|
||||
pkgs.strace
|
||||
];
|
||||
#preConfigure = ''
|
||||
# export NODES_HOME="${last.nodes}"
|
||||
# export NANOS6_HOME="${last.nanos6}"
|
||||
#'';
|
||||
});
|
||||
|
||||
ovni-nompi = last.ovni.overrideAttrs (old: {
|
||||
buildInputs = pkgs.lib.filter (x: x != last.mpi ) old.buildInputs;
|
||||
cmakeFlags = old.cmakeFlags ++ [ "-DUSE_MPI=OFF" ];
|
||||
preConfigure = ''
|
||||
export NODES_HOME="${last.nodes}"
|
||||
export NANOS6_HOME="${last.nanos6}"
|
||||
'';
|
||||
});
|
||||
|
||||
ovni-asan = last.ovni-rt.overrideAttrs (old: {
|
||||
|
Loading…
Reference in New Issue
Block a user