Merge pull request #1081 from nevkontakte/master

nevkontakte · web-flow · commit e8a8f89b521b · 2021-10-30T21:05:17.000+01:00
Improve temporary file management in `gopherjs test`.
diff --git a/tool.go b/tool.go
@@ -432,18 +432,19 @@ func main() {
 						return err
 					}
 				} else {
-					outfile, err = ioutil.TempFile(currentDirectory, "test.")
+					outfile, err = os.CreateTemp(currentDirectory, pkg.Package.Name+"_test.*.js")
 					if err != nil {
 						return err
 					}
+					outfile.Close() // Release file handle early, we only need the name.
 				}
-				defer func() {
-					outfile.Close()
+				cleanupTemp := func() {
 					if *outputFilename == "" {
 						os.Remove(outfile.Name())
 						os.Remove(outfile.Name() + ".map")
 					}
-				}()
+				}
+				defer cleanupTemp() // Safety net in case cleanup after execution doesn't happen.
 
 				if err := s.WriteCommandPackage(mainPkgArchive, outfile.Name()); err != nil {
 					return err
@@ -487,6 +488,8 @@ func main() {
 
 					err := runNode(outfile.Name(), args, runTestDir(pkg), options.Quiet, testOut)
 
+					cleanupTemp() // Eagerly cleanup temporary compiled files after execution.
+
 					if testOut != nil {
 						io.Copy(os.Stdout, testOut)
 					}

Original file line number	Diff line number	Diff line change
`@@ -432,18 +432,19 @@ func main() {`
`432`	`432`	`return err`
`433`	`433`	`}`
`434`	`434`	`} else {`
`435`		`- outfile, err = ioutil.TempFile(currentDirectory, "test.")`
	`435`	`+ outfile, err = os.CreateTemp(currentDirectory, pkg.Package.Name+"_test.*.js")`
`436`	`436`	`if err != nil {`
`437`	`437`	`return err`
`438`	`438`	`}`
	`439`	`+ outfile.Close() // Release file handle early, we only need the name.`
`439`	`440`	`}`
`440`		`- defer func() {`
`441`		`- outfile.Close()`
	`441`	`+ cleanupTemp := func() {`
`442`	`442`	`if *outputFilename == "" {`
`443`	`443`	`os.Remove(outfile.Name())`
`444`	`444`	`os.Remove(outfile.Name() + ".map")`
`445`	`445`	`}`
`446`		`- }()`
	`446`	`+ }`
	`447`	`+ defer cleanupTemp() // Safety net in case cleanup after execution doesn't happen.`
`447`	`448`
`448`	`449`	`if err := s.WriteCommandPackage(mainPkgArchive, outfile.Name()); err != nil {`
`449`	`450`	`return err`
`@@ -487,6 +488,8 @@ func main() {`
`487`	`488`
`488`	`489`	`err := runNode(outfile.Name(), args, runTestDir(pkg), options.Quiet, testOut)`
`489`	`490`
	`491`	`+ cleanupTemp() // Eagerly cleanup temporary compiled files after execution.`
	`492`	`+`
`490`	`493`	`if testOut != nil {`
`491`	`494`	`io.Copy(os.Stdout, testOut)`
`492`	`495`	`}`