support multiple expected outputs per input

Signed-off-by: Nick Mitchell <[email protected]>

demos/data-prep-kit/universal/resize/env.yaml

@@ -0,0 +1 @@
+max_rows_per_table: 125

pkg/boot/bat.go

@@ -87,6 +87,12 @@ func (t BuildAndTester) RunDir(ctx context.Context, group *errgroup.Group, dir,
 
 // Run one build&test for the application specified in `sourcePath`, storing the build in `binaryFullPath`
 func (t BuildAndTester) Run(ctx context.Context, sourcePath, binaryRelPath, binaryFullPath string) error {
+	select {
+	case <-ctx.Done():
+		return nil
+	default:
+	}
+
 	binaryName := filepath.Base(binaryFullPath)
 
 	if err := builder.Build(

pkg/boot/tester.go

@@ -49,7 +49,10 @@ func (t Tester) prepareInputs(testData hlir.TestData, stageDir string) (inputs [
 	expectedDir := build.TestDataDirForExpected(stageDir)
 	for _, test := range testData {
 		inputs = append(inputs, filepath.Join(inputDir, test.Input))
-		outputs = append(outputs, filepath.Join(expectedDir, test.Expected))
+
+		for _, expected := range test.Expected {
+			outputs = append(outputs, filepath.Join(expectedDir, expected))
+		}
 	}
 
 	if t.Options.Verbose() {

pkg/fe/builder/overlay/filesystem.go

@@ -9,6 +9,7 @@ import (
 	"regexp"
 	"runtime"
 	"slices"
+	"strconv"
 	"strings"
 
 	"github.com/dustin/go-humanize/english"
@@ -274,21 +275,27 @@ func (b filesystemBuilder) addTestData(spec *hlir.Spec, sourcePath, templatePath
 					// Hmm, check if it exists with a .gz extension
 					output = filepath.Join(expectedDir, input.Name()+".gz")
 					if _, err := os.Stat(output); err != nil {
-						// Hmm, check if it exists with an _0 extension
+						// Hmm, check if it exists with _0, _1, ... extensions
 						idx := strings.Index(input.Name(), ".")
-						output = ""
 						if idx >= 0 {
-							output = filepath.Join(expectedDir, input.Name()[:idx]+"_0"+input.Name()[idx:])
-							if _, err := os.Stat(output); err != nil {
-								output = ""
+							outputNum := 0
+							for {
+								output = filepath.Join(expectedDir, input.Name()[:idx]+"_"+strconv.Itoa(outputNum)+input.Name()[idx:])
+								if _, err := os.Stat(output); err != nil {
+									break
+								}
+								test.Expected = append(test.Expected, filepath.Base(output))
+								outputNum++
 							}
 						}
+					} else {
+						test.Expected = []string{filepath.Base(output)}
 					}
+				} else {
+					test.Expected = []string{filepath.Base(output)}
 				}
 
-				if output != "" {
-					test.Expected = filepath.Base(output)
-				} else {
+				if len(test.Expected) == 0 {
 					// Then the application does not provided expected output
 					fmt.Fprintf(os.Stderr, "%s Warning: expected output not provided for %s\n", colors.Yellow.Render(b.appname), input.Name())
 				}

pkg/ir/hlir/testdata.go

@@ -1,9 +1,11 @@
 package hlir
 
 type TestDatum struct {
-	Name     string
-	Input    string
-	Expected string
+	Name  string
+	Input string
+
+	// Each Input may provide 0 or more Expected outputs, hence the array
+	Expected []string
 }
 
 type TestData = []TestDatum