Use CWD for temp files, and fall back to /tmp only for upstream tests.

flimzy · flimzy · commit a76f0eda9344 · 2015-12-19T21:02:34.000+01:00
diff --git a/tool.go b/tool.go
@@ -223,7 +223,10 @@ func main() {
 				return fmt.Errorf("gopherjs run: no go files listed")
 			}
 
-			tempfile, err := ioutil.TempFile("", filepath.Base(args[0])+".")
+			tempfile, err := ioutil.TempFile(currentDirectory, filepath.Base(args[0])+".")
+			if err != nil && strings.HasPrefix(currentDirectory, runtime.GOROOT()) {
+				tempfile, err = ioutil.TempFile("", filepath.Base(args[0])+".")
+			}
 			if err != nil {
 				return err
 			}
@@ -363,7 +366,7 @@ func main() {
 					return err
 				}
 
-				tempfile, err := ioutil.TempFile("", "test.")
+				tempfile, err := ioutil.TempFile(currentDirectory, "test.")
 				if err != nil {
 					return err
 				}

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,10 @@ func main() {`
`223`	`223`	`return fmt.Errorf("gopherjs run: no go files listed")`
`224`	`224`	`}`
`225`	`225`
`226`		`- tempfile, err := ioutil.TempFile("", filepath.Base(args[0])+".")`
	`226`	`+ tempfile, err := ioutil.TempFile(currentDirectory, filepath.Base(args[0])+".")`
	`227`	`+ if err != nil && strings.HasPrefix(currentDirectory, runtime.GOROOT()) {`
	`228`	`+ tempfile, err = ioutil.TempFile("", filepath.Base(args[0])+".")`
	`229`	`+ }`
`227`	`230`	`if err != nil {`
`228`	`231`	`return err`
`229`	`232`	`}`
`@@ -363,7 +366,7 @@ func main() {`
`363`	`366`	`return err`
`364`	`367`	`}`
`365`	`368`
`366`		`- tempfile, err := ioutil.TempFile("", "test.")`
	`369`	`+ tempfile, err := ioutil.TempFile(currentDirectory, "test.")`
`367`	`370`	`if err != nil {`
`368`	`371`	`return err`
`369`	`372`	`}`