eval: Call RunTest from individual test files.

eval/builtin_fn_cmd_test.go

@@ -1,5 +1,7 @@
 package eval
 
-func init() {
+import "testing"
-	addToEvalTests([]Test{})
+
+func TestBuiltinFnCmd(t *testing.T) {
+	RunTests(t, dataDir, []Test{})
 }

eval/builtin_fn_container_test.go

@@ -1,7 +1,9 @@
 package eval
 
-func init() {
+import "testing"
-	addToEvalTests([]Test{
+
+func TestBuiltinFnContainer(t *testing.T) {
+	RunTests(t, dataDir, []Test{
 		{`range 3`, want{out: strs("0", "1", "2")}},
 		{`range 1 3`, want{out: strs("1", "2")}},
 		{`range 0 10 &step=3`, want{out: strs("0", "3", "6", "9")}},

eval/builtin_fn_flow_test.go

@@ -1,7 +1,9 @@
 package eval
 
-func init() {
+import "testing"
-	addToEvalTests([]Test{
+
+func TestBuiltinFnFlow(t *testing.T) {
+	RunTests(t, dataDir, []Test{
 		{`run-parallel { put lorem } { echo ipsum }`,
 			want{out: strs("lorem"), bytesOut: []byte("ipsum\n")}},
 

eval/builtin_fn_fs_test.go

@@ -2,12 +2,12 @@ package eval
 
 import (
 	"path/filepath"
+	"testing"
 )
 
-var pathSep = string(filepath.Separator)
+func TestBuiltinFnFS(t *testing.T) {
-
+	pathSep := string(filepath.Separator)
-func init() {
+	RunTests(t, dataDir, []Test{
-	addToEvalTests([]Test{
 		{`path-base a/b/c.png`, want{out: strs("c.png")}},
 		{`tilde-abbr $E:HOME` + pathSep + `foobar`,
 			want{out: strs("~" + pathSep + "foobar")}},

eval/builtin_fn_io_test.go

@@ -1,7 +1,9 @@
 package eval
 
-func init() {
+import "testing"
-	addToEvalTests([]Test{
+
+func TestBuiltinFnIO(t *testing.T) {
+	RunTests(t, dataDir, []Test{
 		{`put foo bar`, want{out: strs("foo", "bar")}},
 
 		{`print [foo bar]`, want{bytesOut: []byte("[foo bar]")}},

eval/builtin_fn_num_test.go

@@ -1,7 +1,9 @@
 package eval
 
-func init() {
+import "testing"
-	addToEvalTests([]Test{
+
+func TestBuiltinFnNum(t *testing.T) {
+	RunTests(t, dataDir, []Test{
 		{`== 1 1.0`, wantTrue},
 		{`== 10 0xa`, wantTrue},
 		{`== a a`, want{err: errAny}},

eval/builtin_fn_str_test.go

@@ -1,7 +1,9 @@
 package eval
 
-func init() {
+import "testing"
-	addToEvalTests([]Test{
+
+func TestBuiltinFnStr(t *testing.T) {
+	RunTests(t, dataDir, []Test{
 		{`==s haha haha`, wantTrue},
 		{`==s 10 10.0`, wantFalse},
 		{`<s a b`, wantTrue},

eval/builtin_fn_test.go

@@ -1,5 +1,7 @@
 package eval
 
+import "testing"
+
 var builtinFnTests = []Test{
 	{"nop", wantNothing},
 	{"nop a b", wantNothing},
@@ -40,6 +42,6 @@ var builtinFnTests = []Test{
 	{`(constantly foo) bad`, want{err: errAny}},
 }
 
-func init() {
+func TestBuiltinFn(t *testing.T) {
-	addToEvalTests(builtinFnTests)
+	RunTests(t, dataDir, builtinFnTests)
 }

eval/builtin_special_test.go

@@ -1,5 +1,7 @@
 package eval
 
+import "testing"
+
 var builtinSpecialTests = []Test{
 	// Control structures
 	// ------------------
@@ -62,6 +64,6 @@ var builtinSpecialTests = []Test{
 	// TODO: Test module namespace
 }
 
-func init() {
+func TestBuiltinSpecial(t *testing.T) {
-	addToEvalTests(builtinSpecialTests)
+	RunTests(t, dataDir, builtinSpecialTests)
 }

eval/compile_op_test.go

@@ -1,5 +1,7 @@
 package eval
 
+import "testing"
+
 var opTests = []Test{
 	// Chunks
 	// ------
@@ -78,6 +80,6 @@ var opTests = []Test{
 		want{bytesOut: []byte("haha\n")}},
 }
 
-func init() {
+func TestOp(t *testing.T) {
-	addToEvalTests(opTests)
+	RunTests(t, dataDir, opTests)
 }

eval/compile_value_test.go

@@ -1,5 +1,7 @@
 package eval
 
+import "testing"
+
 var valueTests = []Test{
 	// Compounding
 	// -----------
@@ -94,6 +96,6 @@ var valueTests = []Test{
 	{"[a &k=v]{ put $a $k } foo", want{out: strs("foo", "v")}},
 }
 
-func init() {
+func TestValue(t *testing.T) {
-	addToEvalTests(valueTests)
+	RunTests(t, dataDir, valueTests)
 }

eval/eval_test.go

@@ -17,12 +17,7 @@ func TestBuiltinPid(t *testing.T) {
 	}
 }
 
-// To be called from init in separate test files.
+var miscEvalTests = []Test{
-func addToEvalTests(tests []Test) {
-	evalTests = append(evalTests, tests...)
-}
-
-var evalTests = []Test{
 	// Pseudo-namespaces local: and up:
 	{"x=lorem; []{local:x=ipsum; put $up:x $local:x}",
 		want{out: strs("lorem", "ipsum")}},
@@ -33,8 +28,8 @@ var evalTests = []Test{
 	{"del E:FOO; put $E:FOO", want{out: strs("")}},
 }
 
-func TestEval(t *testing.T) {
+func TestMiscEval(t *testing.T) {
-	testEval(t, dataDir, evalTests)
+	RunTests(t, dataDir, miscEvalTests)
 }
 
 func TestMultipleEval(t *testing.T) {

eval/testutils.go

@@ -102,7 +102,7 @@ func (t Test) WantAnyErr(err error) Test {
 	return t
 }
 
-func testEval(t *testing.T, dataDir string, evalTests []Test) {
+func RunTests(t *testing.T, dataDir string, evalTests []Test) {
 	for _, tt := range evalTests {
 		// fmt.Printf("eval %q\n", tt.text)