coreutils: fix tests failing on f2fs #40719

voobscout · 2018-05-18T12:46:30Z

Motivation for this change

nixos-rebuild switch fails on F2FS based install.

============================================================================
Testsuite summary for GNU coreutils 8.29
============================================================================
# TOTAL: 603
# PASS:  464
# SKIP:  138
# XFAIL: 0
# FAIL:  1
# XPASS: 0
# ERROR: 0
============================================================================
See ./tests/test-suite.log
Please report to bug-coreutils@gnu.org
============================================================================

The culprit is "du threshold test" in tests/du/threshold.sh

Things done

Removed failing test, as originally suggested by @edolstra in the comments:

nixpkgs/pkgs/tools/misc/coreutils/default.nix

Lines 26 to 35 in 31712af

# The test tends to fail on btrfs and maybe other unusual filesystems.

postPatch = optionalString (!hostPlatform.isDarwin) ''

sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh

sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh

sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh

sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh

sed '2i echo Skipping chmod setgid test && exit 0' -i ./tests/chmod/setgid.sh

substituteInPlace ./tests/install/install-C.sh \

--replace 'mode3=2755' 'mode3=1755'

'';

Fixes the broken 0f5d597 commit.

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jhiccup/versions. These checks were done: - built on NixOS - Warning: no invocation of /nix/store/di6qgm16dycmq6xg4jhwbmin207kykkr-jhiccup-2.0.9/bin/jHiccup had a zero exit code or showed the expected version - /nix/store/di6qgm16dycmq6xg4jhwbmin207kykkr-jhiccup-2.0.9/bin/jHiccupLogProcessor passed the binary check. - 1 of 2 passed binary check by having a zero exit code. - 0 of 2 passed binary check by having the new version present in output. - found 2.0.9 with grep in /nix/store/di6qgm16dycmq6xg4jhwbmin207kykkr-jhiccup-2.0.9 - directory tree listing: https://gist.github.com/83abe7e20b3fd3db4dd38e3223479de0 - du listing: https://gist.github.com/196b47d4bb8d9ecf736bb2a7be08ce2c

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gtkwave/versions. These checks were done: - built on NixOS - /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/evcd2vcd passed the binary check. - /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/fst2vcd passed the binary check. - /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vcd2fst passed the binary check. - /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/fstminer passed the binary check. - Warning: no invocation of /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/ghwdump had a zero exit code or showed the expected version - /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/lxt2miner passed the binary check. - /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/lxt2vcd passed the binary check. - Warning: no invocation of /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/shmidcat had a zero exit code or showed the expected version - /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vcd2lxt passed the binary check. - /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vcd2lxt2 passed the binary check. - /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vcd2vzt passed the binary check. - /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vzt2vcd passed the binary check. - /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vztminer passed the binary check. - /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/gtkwave passed the binary check. - Warning: no invocation of /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/twinwave had a zero exit code or showed the expected version - Warning: no invocation of /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/rtlbrowse had a zero exit code or showed the expected version - /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vermin passed the binary check. - 13 of 17 passed binary check by having a zero exit code. - 0 of 17 passed binary check by having the new version present in output. - found 3.3.90 with grep in /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90 - directory tree listing: https://gist.github.com/cf30f5f6dd398a3083156aed84f02f36 - du listing: https://gist.github.com/6d77f0a1fdfe06cfe325c3873fdfd97c

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/imagemagick/versions. These checks were done: - built on NixOS - /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/animate passed the binary check. - /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/compare passed the binary check. - /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/composite passed the binary check. - /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/conjure passed the binary check. - /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/convert passed the binary check. - /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/display passed the binary check. - /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/identify passed the binary check. - /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/import passed the binary check. - /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/magick-script passed the binary check. - /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/mogrify passed the binary check. - /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/montage passed the binary check. - Warning: no invocation of /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/stream had a zero exit code or showed the expected version - /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/magick passed the binary check. - 12 of 13 passed binary check by having a zero exit code. - 0 of 13 passed binary check by having the new version present in output. - found 7.0.7-32 with grep in /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32 - directory tree listing: https://gist.github.com/f22a02931178895b4d9ac8401f7d6eb8 - du listing: https://gist.github.com/d5150ae0b886668b2b42f583409a14a4

- Add runtime dependence on xkeyboard-config - Add base.lst from xkeyboard-config to the list of keyboard layout files. Something similar to this has been removed in a previous patch by mistake. - Fix location of binary edge_cc. This has been removed in a previous patch by mastake. - Make the explanation for the wrapping of some binaries more clear.

xeji

The additional commits added above look like they don't belong here. Please check.

voobscout · 2018-05-24T19:55:51Z

What's up with all the commits I didn't add?

xeji · 2018-05-24T19:57:26Z

That can happen when a rebase is done incorrectly. I suggest you close this and open a new PR to clean it up.

voobscout · 2018-05-26T04:53:45Z

@xeji just to be clear, what's the correct way of rebasing?

After forking, I did

git clone git@github.com:voobscout/nixpkgs.git
cd nixpkgs
git remote add upstream https://github.com/NixOS/nixpkgs.git
git fetch upstream
git rebase upstream/master

Added my changes and committed. What went wrong?

xeji · 2018-05-26T09:15:48Z

By default, git rebase applies all commits since the common ancestor of both branches on top of (here) upstream/master. If the branches have diverged by more than your own changes, you end up with unwanted commits. To avoid that, use git rebase --onto upstream/master start master and specify the starting point of your changes (direct ancestor of your first own commit) in start . See the detailed explanation in man git-rebase. It is also recommended to use a separate branch for each pull request, not master from your fork.

voobscout · 2018-05-26T09:19:13Z

@xeji Many thanks! I'll redo this properly.

coreutils: fix tests failing on f2fs

8eff1be

GrahamcOfBorg added 10.rebuild-linux-stdenv 10.rebuild-darwin: 1-10 10.rebuild-linux: 501+ labels May 18, 2018

primeos and others added 6 commits May 18, 2018 17:42

androidStudioPackages.{dev,canary}: 3.2.0.13 -> 3.2.0.14

0c8dd9c

Remove all references to absent nixos-prepare-root

b30c22a

Fixes the broken 0f5d597 commit.

GrahamcOfBorg added 6.topic: nixos 8.has: module (update) labels May 18, 2018

xeji suggested changes May 18, 2018

View reviewed changes

Merge remote-tracking branch 'upstream/master'

3ce44bc

GrahamcOfBorg removed 6.topic: nixos 8.has: module (update) labels May 26, 2018

voobscout closed this May 26, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

coreutils: fix tests failing on f2fs #40719

coreutils: fix tests failing on f2fs #40719

voobscout commented May 18, 2018

xeji left a comment

voobscout commented May 24, 2018

xeji commented May 24, 2018

voobscout commented May 26, 2018

xeji commented May 26, 2018

voobscout commented May 26, 2018

	# The test tends to fail on btrfs and maybe other unusual filesystems.
	postPatch = optionalString (!hostPlatform.isDarwin) ''
	sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh
	sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh
	sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh
	sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh
	sed '2i echo Skipping chmod setgid test && exit 0' -i ./tests/chmod/setgid.sh
	substituteInPlace ./tests/install/install-C.sh \
	--replace 'mode3=2755' 'mode3=1755'
	'';

coreutils: fix tests failing on f2fs #40719

coreutils: fix tests failing on f2fs #40719

Conversation

voobscout commented May 18, 2018

Motivation for this change

Things done

xeji left a comment

Choose a reason for hiding this comment

voobscout commented May 24, 2018

xeji commented May 24, 2018

voobscout commented May 26, 2018

xeji commented May 26, 2018

voobscout commented May 26, 2018