Test program stuff

Author: jakebailey

Herebyfile.mjs

@@ -51,6 +51,20 @@ function parseEnvBoolean(name, defaultValue = false) {
     throw new Error(`Invalid value for ${name}: ${value}`);
 }
 
+/**
+ * @param {string} name
+ * @param {string} defaultValue
+ * @returns {string}
+ */
+function parseEnvString(name, defaultValue = "") {
+    name = "TSGO_HEREBY_" + name.toUpperCase();
+    const value = process.env[name];
+    if (!value) {
+        return defaultValue;
+    }
+    return value;
+}
+
 const { values: rawOptions } = parseArgs({
     args: process.argv.slice(2),
     options: {
@@ -65,7 +79,7 @@ const { values: rawOptions } = parseArgs({
 
         race: { type: "boolean", default: parseEnvBoolean("RACE") },
         noembed: { type: "boolean", default: parseEnvBoolean("NOEMBED") },
-        concurrentTestPrograms: { type: "boolean", default: parseEnvBoolean("CONCURRENT_TEST_PROGRAMS") },
+        concurrency: { type: "string", default: parseEnvString("TEST_PROGRAM_CONCURRENCY") },
         coverage: { type: "boolean", default: parseEnvBoolean("COVERAGE") },
     },
     strict: false,
@@ -291,7 +305,7 @@ function goTestFlags(taskName) {
 }
 
 const goTestEnv = {
-    ...(options.concurrentTestPrograms ? { TS_TEST_PROGRAM_SINGLE_THREADED: "false" } : {}),
+    ...(options.concurrency ? { TSGO_TEST_PROGRAM_CONCURRENCY: "false" } : {}),
     // Go test caching takes a long time on Windows.
     // https://github.com/golang/go/issues/72992
     ...(process.platform === "win32" ? { GOFLAGS: "-count=1" } : {}),

internal/compiler/concurrency.go

@@ -39,7 +39,7 @@ type Program struct {
 	opts        ProgramOptions
 	nodeModules map[string]*ast.SourceFile
 
-	concurrency     concurrency
+	concurrency     core.Concurrency
 	concurrencyOnce sync.Once
 	checkerPool     CheckerPool
 	checkerPoolOnce sync.Once
@@ -290,23 +290,23 @@ func (p *Program) GetConfigFileParsingDiagnostics() []*ast.Diagnostic {
 	return slices.Clip(p.opts.Config.GetConfigFileParsingDiagnostics())
 }
 
-func (p *Program) getConcurrency() concurrency {
+func (p *Program) getConcurrency() core.Concurrency {
 	p.concurrencyOnce.Do(func() {
-		p.concurrency = parseConcurrency(p.Options(), len(p.files))
+		p.concurrency = core.ParseConcurrency(p.Options())
 	})
 	return p.concurrency
 }
 
 func (p *Program) singleThreaded() bool {
-	return p.getConcurrency().isSingleThreaded()
+	return p.getConcurrency().SingleThreaded()
 }
 
 func (p *Program) getCheckerPool() CheckerPool {
 	p.checkerPoolOnce.Do(func() {
 		if p.opts.CreateCheckerPool != nil {
 			p.checkerPool = p.opts.CreateCheckerPool(p)
 		} else {
-			p.checkerPool = newCheckerPool(p.getConcurrency().getCheckerCount(len(p.files)), p)
+			p.checkerPool = newCheckerPool(p.getConcurrency().CheckerCount(len(p.files)), p)
 		}
 	})
 	return p.checkerPool

internal/compiler/program.go

@@ -0,0 +1,76 @@
+package core
+
+import (
+	"fmt"
+	"os"
+	"runtime"
+	"strconv"
+	"strings"
+	"sync"
+
+	"github.com/microsoft/typescript-go/internal/testutil/race"
+)
+
+type Concurrency struct {
+	checkerCount int
+}
+
+func ParseConcurrency(options *CompilerOptions) Concurrency {
+	if options.SingleThreaded.IsTrue() {
+		return Concurrency{
+			checkerCount: 1,
+		}
+	}
+	return parseConcurrency(options.Concurrency)
+}
+
+func parseConcurrency(v string) Concurrency {
+	checkerCount := 4
+
+	switch strings.ToLower(v) {
+	case "default", "auto":
+		break
+	case "single", "none":
+		checkerCount = 1
+	case "max":
+		checkerCount = runtime.GOMAXPROCS(0)
+	case "half":
+		checkerCount = max(1, runtime.GOMAXPROCS(0)/2)
+	case "checker-per-file":
+		checkerCount = -1
+	default:
+		if v, err := strconv.Atoi(v); err == nil && v > 0 {
+			checkerCount = v
+		}
+	}
+
+	return Concurrency{
+		checkerCount: checkerCount,
+	}
+}
+
+func (c Concurrency) SingleThreaded() bool {
+	return c.checkerCount == 1
+}
+
+func (c Concurrency) CheckerCount(numFiles int) int {
+	if c.checkerCount == -1 {
+		return max(1, numFiles)
+	}
+	return max(1, c.checkerCount)
+}
+
+var testProgramConcurrency = sync.OnceValues(func() (concurrency Concurrency, raw string) {
+	// Leave Program in SingleThreaded mode unless explicitly configured or in race mode.
+	v := os.Getenv("TSGO_TEST_PROGRAM_CONCURRENCY")
+	if v == "" && !race.Enabled {
+		v = "single"
+	}
+	c := parseConcurrency(v)
+	fmt.Println(c, v)
+	return c, v
+})
+
+func TestProgramConcurrency() (concurrency Concurrency, raw string) {
+	return testProgramConcurrency()
+}

internal/core/concurrency.go

@@ -335,7 +335,8 @@ var concurrentSkippedErrorBaselines = collections.NewSetFromItems(
 
 func (c *compilerTest) verifyDiagnostics(t *testing.T, suiteName string, isSubmodule bool) {
 	t.Run("error", func(t *testing.T) {
-		if !testutil.TestProgramIsSingleThreaded() && concurrentSkippedErrorBaselines.Has(c.testName) {
+		concurrency, _ := core.TestProgramConcurrency()
+		if !concurrency.SingleThreaded() && concurrentSkippedErrorBaselines.Has(c.testName) {
 			t.Skip("Skipping error baseline in concurrent mode")
 		}
 

internal/testrunner/compiler_runner.go

@@ -25,7 +25,6 @@ import (
 	"github.com/microsoft/typescript-go/internal/repo"
 	"github.com/microsoft/typescript-go/internal/scanner"
 	"github.com/microsoft/typescript-go/internal/sourcemap"
-	"github.com/microsoft/typescript-go/internal/testutil"
 	"github.com/microsoft/typescript-go/internal/tsoptions"
 	"github.com/microsoft/typescript-go/internal/tspath"
 	"github.com/microsoft/typescript-go/internal/vfs"
@@ -182,9 +181,9 @@ func CompileFilesEx(
 		compilerOptions.TypeRoots[i] = tspath.GetNormalizedAbsolutePath(typeRoot, currentDirectory)
 	}
 
-	if compilerOptions.Concurrency == "" && compilerOptions.SingleThreaded.IsUnknown() && testutil.TestProgramIsSingleThreaded() {
-		// TODO(jakebailey): replace TestProgramIsSingleThreaded with passed in value
-		compilerOptions.Concurrency = "1"
+	if compilerOptions.Concurrency == "" && compilerOptions.SingleThreaded.IsUnknown() {
+		_, concurrency := core.TestProgramConcurrency()
+		compilerOptions.Concurrency = concurrency
 	}
 
 	// Create fake FS for testing

internal/testutil/harnessutil/harnessutil.go

@@ -1,13 +1,9 @@
 package testutil
 
 import (
-	"os"
 	"runtime/debug"
-	"strconv"
-	"sync"
 	"testing"
 
-	"github.com/microsoft/typescript-go/internal/testutil/race"
 	"gotest.tools/v3/assert"
 )
 
@@ -33,17 +29,3 @@ func RecoverAndFail(t *testing.T, msg string) {
 		t.Fatalf("%s:\n%v\n%s", msg, r, string(stack))
 	}
 }
-
-var testProgramIsSingleThreaded = sync.OnceValue(func() bool {
-	// Leave Program in SingleThreaded mode unless explicitly configured or in race mode.
-	if v := os.Getenv("TS_TEST_PROGRAM_SINGLE_THREADED"); v != "" {
-		if b, err := strconv.ParseBool(v); err == nil {
-			return b
-		}
-	}
-	return !race.Enabled
-})
-
-func TestProgramIsSingleThreaded() bool {
-	return testProgramIsSingleThreaded()
-}