From 73964a9b3ac3d323a26848b760d648720c5b4a7b Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Mon, 25 May 2020 12:52:07 +0200
Subject: pkg/instance: extend debug output on syzkaller make error

For debugging of:
https://groups.google.com/forum/#!topic/syzkaller-bugs/2lgvlHd8t1c
---
 pkg/instance/instance.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'pkg/instance/instance.go')

diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go
index 39de02017..201c07cf8 100644
--- a/pkg/instance/instance.go
+++ b/pkg/instance/instance.go
@@ -83,7 +83,13 @@ func (env *env) BuildSyzkaller(repo, commit string) error {
 		"CFLAGS=-fpermissive -w",
 	)
 	if _, err := osutil.Run(time.Hour, cmd); err != nil {
-		return fmt.Errorf("syzkaller build failed: %v", err)
+		goEnvCmd := osutil.Command("go", "env")
+		goEnvCmd.Dir = cfg.Syzkaller
+		goEnvCmd.Env = append(append([]string{}, os.Environ()...), "GOPATH="+cfg.Syzkaller[:srcIndex])
+		goEnvOut, goEnvErr := osutil.Run(time.Hour, goEnvCmd)
+		gitStatusOut, gitStatusErr := osutil.RunCmd(time.Hour, cfg.Syzkaller, "git", "status")
+		return fmt.Errorf("syzkaller build failed: %v\ngo env (err=%v)\n%s\ngit status (err=%v)\n%s",
+			err, goEnvErr, goEnvOut, gitStatusErr, gitStatusOut)
 	}
 	return nil
 }
-- 
cgit mrf-deployment