rarias/ovni
rarias/ovni
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Use local ovni for tests

Browse Source
This commit is contained in:
Rodrigo Arias 2023-05-30 17:16:00 +02:00
parent cec52ada83
commit 778c119bd6
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nix/rt.nix
View File

@ -23,8 +23,10 @@ let
''; '';
}; };
ovni-local = last.callPackage ./ovni.nix { };
# Build ovni with old gcc versions # Build ovni with old gcc versions
genOldOvni = stdenv: (last.ovni.override { genOldOvni = stdenv: (last.ovni-local.override {
stdenv = stdenv; stdenv = stdenv;
}).overrideAttrs (old: { }).overrideAttrs (old: {
pname = old.name + "@" + stdenv.cc.cc.version; pname = old.name + "@" + stdenv.cc.cc.version;
@ -60,10 +62,15 @@ let
oldOvnisRelease = map last.genOldOvniRelease last.oldCompilers; 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 # 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 # 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 # 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; stdenv = last.stdenvClangOmpss2;
}).overrideAttrs (old: { }).overrideAttrs (old: {
__noChroot = true; __noChroot = true;
@ -75,15 +82,10 @@ let
last.nodes last.nodes
pkgs.strace pkgs.strace
]; ];
#preConfigure = '' preConfigure = ''
# export NODES_HOME="${last.nodes}" export NODES_HOME="${last.nodes}"
# export NANOS6_HOME="${last.nanos6}" 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" ];
}); });
ovni-asan = last.ovni-rt.overrideAttrs (old: { ovni-asan = last.ovni-rt.overrideAttrs (old: {