diff options
| author | 宋文武 <iyzsong@gmail.com> | 2015-01-15 11:02:43 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@gmail.com> | 2015-01-15 11:05:18 +0800 |
| commit | 2b2f91ad87f170e3faf340da48204d50932b2ecd (patch) | |
| tree | b2068ecf9218d6b3aad0ea33b57581aaea37c72f /gnu/packages/ninja.scm | |
| parent | f220a8384890b2a50f30c62fba56e507333f1a92 (diff) | |
| download | guix-patches-2b2f91ad87f170e3faf340da48204d50932b2ecd.tar guix-patches-2b2f91ad87f170e3faf340da48204d50932b2ecd.tar.gz | |
gnu: ninja: Disable testcase SubprocessTest.InterruptChild.
* gnu/packages/patches/ninja-tests.patch: New file.
* gnu/packages/ninja.scm (ninja): Add the patch.
* gnu-system.am (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages/ninja.scm')
| -rw-r--r-- | gnu/packages/ninja.scm | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/gnu/packages/ninja.scm b/gnu/packages/ninja.scm index fe3f955b5d..7416b67d02 100644 --- a/gnu/packages/ninja.scm +++ b/gnu/packages/ninja.scm @@ -34,7 +34,8 @@ "archive/v" version ".tar.gz")) (sha256 (base32 - "1h3yfwcfl61v493vna6jia2fizh8rpig7qw2504cvkr6gid3p5bw")))) + "1h3yfwcfl61v493vna6jia2fizh8rpig7qw2504cvkr6gid3p5bw")) + (patches (list (search-patch "ninja-tests.patch"))))) (build-system gnu-build-system) (arguments '(#:phases @@ -52,18 +53,7 @@ (lambda _ (and (zero? (system* "./configure.py")) (zero? (system* "./ninja" "ninja_test")) - ;; SubprocessTest.SetWithLots fails with: - ;; Raise [ulimit -n] well above 1025 to make this test go. - ;; Skip it. - ;; - ;; SubprocessTest.InterruptChild fails when using 'system*': - ;; *** Failure in src/subprocess_test.cc:83 - ;; ExitInterrupted == subproc->Finish() - ;; Pass it by using 'system' instead of 'system*'. - (zero? (system (string-append - "./ninja_test " - "--gtest_filter=" - "-SubprocessTest.SetWithLots"))))) + (zero? (system* "./ninja_test")))) (alist-replace 'install (lambda* (#:key outputs #:allow-other-keys) |