all: split golden images based on GOARCH

gonum · Jun 16, 2024 · 4e82ce6 · 4e82ce6
1 parent caf665d
commit 4e82ce6
Show file tree

Hide file tree

Showing 38 changed files with 1,657 additions and 21 deletions.
diff --git a/cmpimg/checkplot.go b/cmpimg/checkplot.go
@@ -29,6 +29,8 @@ func goldenPath(path string) string {
 // For image.Image formats, a base64 encoded png representation is output to
 // the testing log when a difference is identified.
 func CheckPlot(ExampleFunc func(), t *testing.T, filenames ...string) {
+	t.Helper()
+
 	CheckPlotApprox(ExampleFunc, t, 0, filenames...)
 }
 

diff --git a/plot_test.go b/plot_test.go
@@ -10,6 +10,7 @@ import (
 	"image/color"
 	"math"
 	"os"
+	"runtime"
 	"testing"
 	"time"
 
@@ -182,9 +183,9 @@ func TestDrawGlyphBoxes(t *testing.T) {
 			t.Fatalf("error: %+v", err)
 		}
 
-		err = os.WriteFile("testdata/glyphbox.png", buf.Bytes(), 0644)
+		err = os.WriteFile("testdata/glyphbox_"+runtime.GOARCH+".png", buf.Bytes(), 0644)
 		if err != nil {
 			t.Fatalf("could not save plot: %+v", err)
 		}
-	}, t, "glyphbox.png")
+	}, t, "glyphbox_"+runtime.GOARCH+".png")
 }
diff --git a/plotter/barchart_example_test.go b/plotter/barchart_example_test.go
@@ -7,6 +7,7 @@ package plotter_test
 import (
 	"image/color"
 	"log"
+	"runtime"
 
 	"golang.org/x/exp/rand"
 
@@ -43,7 +44,7 @@ func ExampleBarChart() {
 	}
 	p2.Add(horizontalBarChart)
 	p2.NominalY(horizontalLabels...)
-	err = p2.Save(100, 100, "testdata/horizontalBarChart.png")
+	err = p2.Save(100, 100, "testdata/horizontalBarChart_"+runtime.GOARCH+".png")
 	if err != nil {
 		log.Panic(err)
 	}

diff --git a/plotter/barchart_test.go b/plotter/barchart_test.go
@@ -5,14 +5,15 @@
 package plotter_test
 
 import (
+	"runtime"
 	"testing"
 
 	"gonum.org/v1/plot/cmpimg"
 )
 
 func TestBarChart(t *testing.T) {
 	cmpimg.CheckPlot(ExampleBarChart, t, "verticalBarChart.png",
-		"horizontalBarChart.png", "barChart2.png",
+		"horizontalBarChart_"+runtime.GOARCH+".png", "barChart2.png",
 		"stackedBarChart.png")
 }
 

diff --git a/plotter/contour_example_test.go b/plotter/contour_example_test.go
@@ -7,6 +7,7 @@ package plotter_test
 import (
 	"log"
 	"math"
+	"runtime"
 	"testing"
 
 	"golang.org/x/exp/rand"
@@ -51,7 +52,7 @@ func ExampleContour() {
 
 	p.Add(c)
 
-	err := p.Save(10*vg.Centimeter, 10*vg.Centimeter, "testdata/contour.png")
+	err := p.Save(10*vg.Centimeter, 10*vg.Centimeter, "testdata/contour_"+runtime.GOARCH+".png")
 	if err != nil {
 		log.Fatalf("could not save plot: %+v", err)
 	}
@@ -77,5 +78,5 @@ func (g unitGrid) Y(r int) float64 {
 }
 
 func TestContour(t *testing.T) {
-	cmpimg.CheckPlotApprox(ExampleContour, t, 0.01, "contour.png")
+	cmpimg.CheckPlotApprox(ExampleContour, t, 0.01, "contour_"+runtime.GOARCH+".png")
 }
diff --git a/plotter/labels_test.go b/plotter/labels_test.go
@@ -6,6 +6,7 @@ package plotter_test
 
 import (
 	"image/color"
+	"runtime"
 	"testing"
 
 	"gonum.org/v1/plot"
@@ -145,11 +146,11 @@ func TestLabelsWithGlyphBoxes(t *testing.T) {
 			p.Add(plotter.NewGrid())
 			p.Add(plotter.NewGlyphBoxes())
 
-			err = p.Save(10*vg.Centimeter, 10*vg.Centimeter, "testdata/labels_glyphboxes.png")
+			err = p.Save(10*vg.Centimeter, 10*vg.Centimeter, "testdata/labels_glyphboxes_"+runtime.GOARCH+".png")
 			if err != nil {
-				t.Fatalf("could save plot: %+v", err)
+				t.Fatalf("could not save plot: %+v", err)
 			}
 		},
-		t, "labels_glyphboxes.png",
+		t, "labels_glyphboxes_"+runtime.GOARCH+".png",
 	)
 }
diff --git a/plotter/precision_test.go b/plotter/precision_test.go
@@ -6,6 +6,7 @@ package plotter_test
 
 import (
 	"log"
+	"runtime"
 	"testing"
 
 	"gonum.org/v1/plot"
@@ -14,7 +15,7 @@ import (
 )
 
 func TestFloatPrecision(t *testing.T) {
-	const fname = "precision.png"
+	const fname = "precision_" + runtime.GOARCH + ".png"
 
 	cmpimg.CheckPlot(func() {
 		p := plot.New()

diff --git a/plotter/rotation_example_test.go b/plotter/rotation_example_test.go
@@ -8,6 +8,7 @@ import (
 	"image/color"
 	"log"
 	"math"
+	"runtime"
 
 	"gonum.org/v1/plot"
 	"gonum.org/v1/plot/plotter"
@@ -92,7 +93,7 @@ func Example_rotation() {
 	p.Y.Tick.Label.XAlign = draw.XCenter
 	p.Y.Tick.Label.YAlign = draw.YBottom
 
-	err = p.Save(200, 150, "testdata/rotation.png")
+	err = p.Save(200, 150, "testdata/rotation_"+runtime.GOARCH+".png")
 	if err != nil {
 		log.Panic(err)
 	}

diff --git a/plotter/rotation_test.go b/plotter/rotation_test.go
@@ -5,11 +5,12 @@
 package plotter_test
 
 import (
+	"runtime"
 	"testing"
 
 	"gonum.org/v1/plot/cmpimg"
 )
 
 func TestRotation(t *testing.T) {
-	cmpimg.CheckPlot(Example_rotation, t, "rotation.png")
+	cmpimg.CheckPlot(Example_rotation, t, "rotation_"+runtime.GOARCH+".png")
 }
diff --git a/plotter/sankey_example_test.go b/plotter/sankey_example_test.go
@@ -9,6 +9,7 @@ import (
 	"image/color"
 	"log"
 	"os"
+	"runtime"
 
 	"gonum.org/v1/plot"
 	"gonum.org/v1/plot/plotter"
@@ -396,7 +397,7 @@ func ExampleSankey_grouped() {
 
 	p.Draw(dc)
 	pngimg := vgimg.PngCanvas{Canvas: c}
-	f, err := os.Create("testdata/sankeyGrouped.png")
+	f, err := os.Create("testdata/sankeyGrouped_" + runtime.GOARCH + ".png")
 	if err != nil {
 		log.Panic(err)
 	}

diff --git a/plotter/sankey_test.go b/plotter/sankey_test.go
@@ -5,6 +5,7 @@
 package plotter_test
 
 import (
+	"runtime"
 	"testing"
 
 	"gonum.org/v1/plot"
@@ -20,7 +21,7 @@ func TestSankey_simple(t *testing.T) {
 }
 
 func TestSankey_grouped(t *testing.T) {
-	cmpimg.CheckPlot(ExampleSankey_grouped, t, "sankeyGrouped.png")
+	cmpimg.CheckPlot(ExampleSankey_grouped, t, "sankeyGrouped_"+runtime.GOARCH+".png")
 }
 
 // This test checks whether the Sankey plotter makes any changes to

diff --git a/plotter/testdata/contour_amd64_golden.png b/plotter/testdata/contour_amd64_golden.png
diff --git a/plotter/testdata/contour_arm64_golden.png b/plotter/testdata/contour_arm64_golden.png
diff --git a/plotter/testdata/contour_golden.png b/plotter/testdata/contour_golden.png
diff --git a/...er/testdata/horizontalBarChart_golden.png → ...tdata/horizontalBarChart_amd64_golden.png b/...er/testdata/horizontalBarChart_golden.png → ...tdata/horizontalBarChart_amd64_golden.png
diff --git a/plotter/testdata/horizontalBarChart_arm64_golden.png b/plotter/testdata/horizontalBarChart_arm64_golden.png
diff --git a/...ter/testdata/labels_glyphboxes_golden.png → ...stdata/labels_glyphboxes_amd64_golden.png b/...ter/testdata/labels_glyphboxes_golden.png → ...stdata/labels_glyphboxes_amd64_golden.png
diff --git a/plotter/testdata/labels_glyphboxes_arm64_golden.png b/plotter/testdata/labels_glyphboxes_arm64_golden.png
diff --git a/plotter/testdata/precision_golden.png → plotter/testdata/precision_amd64_golden.png b/plotter/testdata/precision_golden.png → plotter/testdata/precision_amd64_golden.png
diff --git a/plotter/testdata/precision_arm64_golden.png b/plotter/testdata/precision_arm64_golden.png
diff --git a/plotter/testdata/rotation_golden.png → plotter/testdata/rotation_amd64_golden.png b/plotter/testdata/rotation_golden.png → plotter/testdata/rotation_amd64_golden.png
diff --git a/plotter/testdata/rotation_arm64_golden.png b/plotter/testdata/rotation_arm64_golden.png
diff --git a/plotter/testdata/sankeyGrouped_golden.png → ...r/testdata/sankeyGrouped_amd64_golden.png b/plotter/testdata/sankeyGrouped_golden.png → ...r/testdata/sankeyGrouped_amd64_golden.png
diff --git a/plotter/testdata/sankeyGrouped_arm64_golden.png b/plotter/testdata/sankeyGrouped_arm64_golden.png
diff --git a/testdata/glyphbox_golden.png → testdata/glyphbox_amd64_golden.png b/testdata/glyphbox_golden.png → testdata/glyphbox_amd64_golden.png
diff --git a/testdata/glyphbox_arm64_golden.png b/testdata/glyphbox_arm64_golden.png
diff --git a/text/latex_example_test.go b/text/latex_example_test.go
@@ -8,6 +8,7 @@ import (
 	"image/color"
 	"log"
 	"math"
+	"runtime"
 	"testing"
 
 	"gonum.org/v1/plot"
@@ -74,12 +75,12 @@ func ExampleLatex() {
 	p.Add(plotter.NewGlyphBoxes())
 	p.Add(plotter.NewGrid())
 
-	err = p.Save(10*vg.Centimeter, 5*vg.Centimeter, "testdata/latex.png")
+	err = p.Save(10*vg.Centimeter, 5*vg.Centimeter, "testdata/latex_"+runtime.GOARCH+".png")
 	if err != nil {
 		log.Fatalf("could not save plot: %+v", err)
 	}
 }
 
 func TestLatex(t *testing.T) {
-	cmpimg.CheckPlot(ExampleLatex, t, "latex.png")
+	cmpimg.CheckPlot(ExampleLatex, t, "latex_"+runtime.GOARCH+".png")
 }
diff --git a/text/testdata/latex_golden.png → text/testdata/latex_amd64_golden.png b/text/testdata/latex_golden.png → text/testdata/latex_amd64_golden.png
diff --git a/text/testdata/latex_arm64_golden.png b/text/testdata/latex_arm64_golden.png
diff --git a/vg/vggio/testdata/func_golden.png b/vg/vggio/testdata/func_golden.png
diff --git a/vg/vgtex/canvas_example_test.go b/vg/vgtex/canvas_example_test.go
@@ -8,6 +8,7 @@ import (
 	"image/color"
 	"log"
 	"os"
+	"runtime"
 
 	"gonum.org/v1/plot"
 	"gonum.org/v1/plot/plotter"
@@ -52,7 +53,7 @@ func Example() {
 	c.SetColor(color.Black)
 	c.FillString(txtFont, vg.Point{X: 2.5 * vg.Centimeter, Y: 2.5 * vg.Centimeter}, "x")
 
-	f, err := os.Create("testdata/scatter.tex")
+	f, err := os.Create("testdata/scatter_" + runtime.GOARCH + ".tex")
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/vg/vgtex/canvas_test.go b/vg/vgtex/canvas_test.go
@@ -6,6 +6,7 @@ package vgtex_test
 
 import (
 	"image/color"
+	"runtime"
 	"testing"
 
 	"gonum.org/v1/plot"
@@ -15,7 +16,7 @@ import (
 )
 
 func TestTexCanvas(t *testing.T) {
-	cmpimg.CheckPlot(Example, t, "scatter.tex")
+	cmpimg.CheckPlot(Example, t, "scatter_"+runtime.GOARCH+".tex")
 }
 
 func TestLineLatex(t *testing.T) {
@@ -58,7 +59,7 @@ func TestLineLatex(t *testing.T) {
 			}
 		}
 	}
-	cmpimg.CheckPlot(test("testdata/linestyle.tex"), t, "linestyle.tex")
+	cmpimg.CheckPlot(test("testdata/linestyle_"+runtime.GOARCH+".tex"), t, "linestyle_"+runtime.GOARCH+".tex")
 	cmpimg.CheckPlot(test("testdata/linestyle.png"), t, "linestyle.png")
 }
 
@@ -85,9 +86,9 @@ func TestFillStyle(t *testing.T) {
 		p.Legend.Add("h", h)
 
 		const size = 5 * vg.Centimeter
-		err = p.Save(size, size, "testdata/fillstyle.tex")
+		err = p.Save(size, size, "testdata/fillstyle_"+runtime.GOARCH+".tex")
 		if err != nil {
 			t.Fatalf("error: %+v", err)
 		}
-	}, t, "fillstyle.tex")
+	}, t, "fillstyle_"+runtime.GOARCH+".tex")
 }
diff --git a/vg/vgtex/testdata/fillstyle_golden.tex → vg/vgtex/testdata/fillstyle_amd64_golden.tex b/vg/vgtex/testdata/fillstyle_golden.tex → vg/vgtex/testdata/fillstyle_amd64_golden.tex