From c2ae91a413fea07751a587cbe53a216edcf25b41 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 26 Aug 2015 11:17:53 -0700
Subject: [PATCH] buildGoPackage: Fix parallel test pid computation

---
 pkgs/development/go-modules/generic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index b5ddba9b981..d4eb127617a 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