about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-08-26 11:17:53 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-08-26 11:17:56 -0700
commitc2ae91a413fea07751a587cbe53a216edcf25b41 (patch)
tree346b425a7d3e5bafe44ea30e2b8f04a83e19d2d4
parent859576c8957f4f7a074f35f308f6b54fb0fcd1bf (diff)
buildGoPackage: Fix parallel test pid computation
-rw-r--r--pkgs/development/go-modules/generic/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index b5ddba9b981c3..d4eb127617aee 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -120,15 +120,15 @@ go.stdenv.mkDerivation (
     if [ -n "$subPackages" ] ; then
         for p in $subPackages ; do
             go test -p $NIX_BUILD_CORES -v $goPackagePath/$p &
+            PIDS+=("$!")
         done
-        PIDS+=("$!")
     else
         pushd go/src
         while read d; do
             go test -p $NIX_BUILD_CORES -v $d &
+            PIDS+=("$!")
         done < <(find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq)
         popd
-        PIDS+=("$!")
     fi
 
     # Exit on error from the parallel process