diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-04-01 19:50:09 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-04-01 19:50:09 +0300 |
| commit | b65dc619f013a8f24df5b16ae5c442837b226e94 (patch) | |
| tree | 559a8d450fac835327e16861ca69962e331a012c /pkgs | |
| parent | 097373e691f5111ed4fb1dcb0d2b694ab59aacd8 (diff) | |
| download | nixlib-b65dc619f013a8f24df5b16ae5c442837b226e94.tar nixlib-b65dc619f013a8f24df5b16ae5c442837b226e94.tar.gz nixlib-b65dc619f013a8f24df5b16ae5c442837b226e94.tar.bz2 nixlib-b65dc619f013a8f24df5b16ae5c442837b226e94.tar.lz nixlib-b65dc619f013a8f24df5b16ae5c442837b226e94.tar.xz nixlib-b65dc619f013a8f24df5b16ae5c442837b226e94.tar.zst nixlib-b65dc619f013a8f24df5b16ae5c442837b226e94.zip | |
xfstests: Fixes
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/xfstests/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index fb56bdf86793..f312f4770b54 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -23,6 +23,14 @@ stdenv.mkDerivation { # Don't canonicalize path to mkfs (in util-linux) - otherwise e.g. mkfs.ext4 isn't found sed -i common/config -e 's|^export MKFS_PROG=.*|export MKFS_PROG=mkfs|' + # Move the Linux-specific test output files to the correct place, or else it will + # try to move them at runtime. Also nuke all the irix crap. + for f in tests/*/*.out.linux; do + mv $f $(echo $f | sed -e 's/\.linux$//') + done + rm -f tests/*/*.out.irix + + # Fix up lots of impure paths for f in common/* tools/* tests/*/*; do sed -i $f -e 's|/bin/bash|${bash}/bin/bash|' sed -i $f -e 's|/bin/true|true|' |