Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: enable working, fix fixable, disable broken tests #44825

Merged
merged 123 commits into from Aug 11, 2018

Conversation

oxij
Copy link
Member

@oxij oxij commented Aug 9, 2018

Motivation for this change

#33599 ("Run check phase by default"). This is yet another^4 (v2) followup to #39464 ("stdenv: implement most of #33599").

Things done
  • Writing from a system with these changes applied on top of SLNOS (NotchB) and doCheckByDefault set, so I think it should work sane enough on top of Nixpkgs too.
  • But I have not built everything this touches yet (in progress) and I still have some patches on the topic that might have influenced my builds, but they need some more work and I'm out of steam on this ATM.
Expectations
  • When to merge: ASAP, but not earlier than in 24 hours.
  • If I'm MIA and this starts conflicting with something just skip conflicting patches from this branch, I'll respin them later.

# sed -i -e 's@dbus/[^ ]*\.\(test\|vala\)@@g' tests/Makefile.am
# '';
#
# checkInputs = [ automake_1_15 ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like we should just leave off it isn't working.

postPatch = ''
for a in test/Makefile.in test/format_test/format_checks.sh.in ; do
substituteInPlace $a \
--replace /bin/bash ${bash}/bin/bash
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's considered more portable to do stdenv.shell instad of ${bash}/bin/bash.

@@ -26,9 +25,7 @@ in stdenv.mkDerivation rec {

propagatedBuildInputs = [ zlib ];

# it's hard to cross-run tests and some check programs didn't compile anyway
makeFlags = stdenv.lib.optional (!doCheck) "check_PROGRAMS=";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might still be needed when stdenv.hostPlatform /= stdenv.buildPlatform;

@@ -22,14 +22,11 @@ stdenv.mkDerivation rec {
pango gcr gdk_pixbuf atk p11-kit
];

# In 3.20.1, tests do not support Python 3
checkInputs = [ dbus python2 ];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you keep the comment?


# The `t0400-loop-clobber-infloop.sh' test wants `mkswap'.
preCheck = ''
export PATH=${utillinux}/sbin:$PATH
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should no longer be needed, sbin is a symlink to bin.

Copy link
Member

@matthewbauer matthewbauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good aside from a few things.

@oxij
Copy link
Member Author

oxij commented Aug 10, 2018 via email

Copy link
Member

@matthewbauer matthewbauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Make sure you follow the Hydra staging jobset after this merges. Occasionally new tests will cause headaches on the Hydra infrastructure.

@edolstra
Copy link
Member

In "Motivation for this change", can you please describe the actual motivation rather than point to different PRs/issues? For example, this PR's motivation refers to #39464, which helpfully is entitled "stdenv: implement most of #33599" and whose motivation says "see #39463". That's not very helpful with a PR that causes an enormous amount of code churn (127 files changed).

@oxij oxij force-pushed the docheck/continues-in-a-big-way branch from 259f9c1 to 35c9435 Compare August 11, 2018 09:37
@oxij
Copy link
Member Author

oxij commented Aug 11, 2018 via email

@oxij
Copy link
Member Author

oxij commented Aug 11, 2018 via email

@7c6f434c
Copy link
Member

Seems fine, and with all the semi-auto-updates we need the tests eventually enabled…

@7c6f434c 7c6f434c merged commit a68e5e9 into NixOS:staging Aug 11, 2018
@oxij oxij deleted the docheck/continues-in-a-big-way branch November 18, 2018 08:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants