diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-10-27 20:21:26 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-10-27 20:21:26 -0400 |
| commit | 3d82676919b952d0a7e205fa5da6320b1cf21e21 (patch) | |
| tree | 02586fee407b667fc9e082f98ad70356eedd7864 /tests | |
| parent | f9a65318ddc34a84fea128b756d23ad619f519dc (diff) | |
| parent | 7500e42b3e51fa9ba5fb2ba552f168081b7f044a (diff) | |
| download | guix-3d82676919b952d0a7e205fa5da6320b1cf21e21.tar guix-3d82676919b952d0a7e205fa5da6320b1cf21e21.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/pypi.scm | 4 | ||||
| -rw-r--r-- | tests/syscalls.scm | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/pypi.scm b/tests/pypi.scm index ab4e9c958b..9d2fcc7391 100644 --- a/tests/pypi.scm +++ b/tests/pypi.scm @@ -122,7 +122,7 @@ baz > 13.37") ('base32 (? string? hash))))) ('build-system 'python-build-system) - ('inputs + ('propagated-inputs ('quasiquote (("python-bar" ('unquote 'python-bar)) ("python-baz" ('unquote 'python-baz)) @@ -182,7 +182,7 @@ baz > 13.37") ('base32 (? string? hash))))) ('build-system 'python-build-system) - ('inputs + ('propagated-inputs ('quasiquote (("python-bar" ('unquote 'python-bar)) ("python-baz" ('unquote 'python-baz)) diff --git a/tests/syscalls.scm b/tests/syscalls.scm index 1b31d87f23..9eb19f9c80 100644 --- a/tests/syscalls.scm +++ b/tests/syscalls.scm @@ -146,7 +146,10 @@ (waitpid fork-pid) result)))))))) -(unless perform-container-tests? +;; XXX: Skip this test when running Linux > 4.7.5 to work around +;; <https://bugzilla.kernel.org/show_bug.cgi?id=183461>. +(when (or (not perform-container-tests?) + (version>? (utsname:release (uname)) "4.7.5")) (test-skip 1)) (test-equal "pivot-root" #t |