From 9c1f54c9ed67b77385940c58fb15af18166d4840 Mon Sep 17 00:00:00 2001
From: Shenghou Ma <minux.ma@gmail.com>
Date: Wed, 15 Feb 2012 13:26:22 -0500
Subject: [PATCH] cmd/go: go test -i correctly handle cgo packages Previous CL
 (5674043) omit the case where runtime/cgo itself is out-of-date. Fixes #2936
 (again).

R=rsc
CC=golang-dev
https://golang.org/cl/5674048
---
 src/cmd/go/test.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/cmd/go/test.go b/src/cmd/go/test.go
index a291262b3f..8c88ea0b02 100644
--- a/src/cmd/go/test.go
+++ b/src/cmd/go/test.go
@@ -15,6 +15,7 @@ import (
 	"os/exec"
 	"path"
 	"path/filepath"
+	"runtime"
 	"sort"
 	"strings"
 	"text/template"
@@ -273,8 +274,15 @@ func runTest(cmd *Command, args []string) {
 			}
 		}
 
+		// translate C to runtime/cgo
+		if deps["C"] {
+			delete(deps, "C")
+			deps["runtime/cgo"] = true
+			if buildContext.GOOS == runtime.GOOS && buildContext.GOARCH == runtime.GOARCH {
+				deps["cmd/cgo"] = true
+			}
+		}
 		// Ignore pseudo-packages.
-		delete(deps, "C")
 		delete(deps, "unsafe")
 
 		all := []string{}
-- 
2.50.0