Pulling back some changes to run.go

grantnelson-wf · grantnelson-wf · commit b533bb50bac4 · 2024-04-11T11:06:29.000-06:00
diff --git a/tests/gorepo/run.go b/tests/gorepo/run.go
@@ -427,10 +427,9 @@ type test struct {
 
 	tempDir string
 	err     error
-
-	// GOPHERJS: Skipping expectFail, see initExpectFail in go/test/run.go
 }
 
+// startTest
 func startTest(dir, gofile string) *test {
 	t := &test{
 		dir:    dir,
@@ -473,7 +472,7 @@ func (t *test) goDirName() string {
 }
 
 func goDirFiles(longdir string) (filter []os.DirEntry, err error) {
-	files, dirErr := os.ReadDir(longdir) // GOPHERJS: Updated to not use deprecated ioutil.ReadDir
+	files, dirErr := os.ReadDir(longdir)
 	if dirErr != nil {
 		return nil, dirErr
 	}

Original file line number	Diff line number	Diff line change
`@@ -427,10 +427,9 @@ type test struct {`
`427`	`427`
`428`	`428`	`tempDir string`
`429`	`429`	`err error`
`430`		`-`
`431`		`- // GOPHERJS: Skipping expectFail, see initExpectFail in go/test/run.go`
`432`	`430`	`}`
`433`	`431`
	`432`	`+// startTest`
`434`	`433`	`func startTest(dir, gofile string) *test {`
`435`	`434`	`t := &test{`
`436`	`435`	`dir: dir,`
`@@ -473,7 +472,7 @@ func (t *test) goDirName() string {`
`473`	`472`	`}`
`474`	`473`
`475`	`474`	`func goDirFiles(longdir string) (filter []os.DirEntry, err error) {`
`476`		`- files, dirErr := os.ReadDir(longdir) // GOPHERJS: Updated to not use deprecated ioutil.ReadDir`
	`475`	`+ files, dirErr := os.ReadDir(longdir)`
`477`	`476`	`if dirErr != nil {`
`478`	`477`	`return nil, dirErr`
`479`	`478`	`}`