Merge pull request #361 from flimzy/tempdir3

neelance · neelance · commit f15a4ac29a07 · 2016-01-06T12:39:36.000+01:00
Use CWD for temp files, and fall back to /tmp only for upstream tests.
diff --git a/tool.go b/tool.go
@@ -233,7 +233,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
 			}
@@ -373,7 +376,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
`@@ -233,7 +233,10 @@ func main() {`
`233`	`233`	`return fmt.Errorf("gopherjs run: no go files listed")`
`234`	`234`	`}`
`235`	`235`
`236`		`- tempfile, err := ioutil.TempFile("", filepath.Base(args[0])+".")`
	`236`	`+ tempfile, err := ioutil.TempFile(currentDirectory, filepath.Base(args[0])+".")`
	`237`	`+ if err != nil && strings.HasPrefix(currentDirectory, runtime.GOROOT()) {`
	`238`	`+ tempfile, err = ioutil.TempFile("", filepath.Base(args[0])+".")`
	`239`	`+ }`
`237`	`240`	`if err != nil {`
`238`	`241`	`return err`
`239`	`242`	`}`
`@@ -373,7 +376,7 @@ func main() {`
`373`	`376`	`return err`
`374`	`377`	`}`
`375`	`378`
`376`		`- tempfile, err := ioutil.TempFile("", "test.")`
	`379`	`+ tempfile, err := ioutil.TempFile(currentDirectory, "test.")`
`377`	`380`	`if err != nil {`
`378`	`381`	`return err`
`379`	`382`	`}`