summary refs log tree commit diff
path: root/pkgs/test
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2018-01-05 23:18:51 +0100
committerDaiderd Jordan <daiderd@gmail.com>2018-01-05 23:20:55 +0100
commit80de99b46be38bff27ce97b7ecbaf462958e9391 (patch)
treeeca242cea41473187921d1752981e0526a4c1384 /pkgs/test
parenta7ef0c03d209e0512be9da390c4dcdf2235730f9 (diff)
downloadnixpkgs-80de99b46be38bff27ce97b7ecbaf462958e9391.tar
nixpkgs-80de99b46be38bff27ce97b7ecbaf462958e9391.tar.gz
nixpkgs-80de99b46be38bff27ce97b7ecbaf462958e9391.tar.bz2
nixpkgs-80de99b46be38bff27ce97b7ecbaf462958e9391.tar.lz
nixpkgs-80de99b46be38bff27ce97b7ecbaf462958e9391.tar.xz
nixpkgs-80de99b46be38bff27ce97b7ecbaf462958e9391.tar.zst
nixpkgs-80de99b46be38bff27ce97b7ecbaf462958e9391.zip
sierra-shared-test: fix build
Using 500 libraries started failing with clang++: Argument list too long
This is enough to reproduce the issue.
Diffstat (limited to 'pkgs/test')
-rw-r--r--pkgs/test/macos-sierra-shared/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/test/macos-sierra-shared/default.nix b/pkgs/test/macos-sierra-shared/default.nix
index 51e8ae53736..73b359ffe6a 100644
--- a/pkgs/test/macos-sierra-shared/default.nix
+++ b/pkgs/test/macos-sierra-shared/default.nix
@@ -3,7 +3,7 @@
 let
   makeBigExe = stdenv: prefix: rec {
 
-    count = 500;
+    count = 320;
 
     sillyLibs = lib.genList (i: stdenv.mkDerivation rec {
       name = "${prefix}-fluff-${toString i}";
@@ -75,13 +75,14 @@ in stdenvNoCC.mkDerivation {
   buildInputs = [ good.finalExe bad.finalExe ];
   # TODO(@Ericson2314): Be impure or require exact MacOS version of builder?
   buildCommand = ''
-    if bad-asdf
-    then echo "bad-asdf can succeed on non-sierra, OK" >&2
+    if bad-asdf &> /dev/null
+    then echo "WARNING: bad-asdf did not fail, not running on sierra?" >&2
     else echo "bad-asdf should fail on sierra, OK" >&2
     fi
 
     # Must succeed on all supported MacOS versions
     good-asdf
+    echo "good-asdf should succeed on sierra, OK"
 
     touch $out
   '';