Adds major version to darwin golden tests

davidbyttow · Jan 13, 2021 · 5f2812d · 5f2812d
1 parent 5e257a4
commit 5f2812d
Show file tree

Hide file tree

Showing 54 changed files with 6 additions and 1 deletion.
diff --git a/resources/bmp.Decode_BMP-darwin-11.golden.png b/resources/bmp.Decode_BMP-darwin-11.golden.png
diff --git a/resources/heic-24bit-exif.RemoveMetadata-darwin-11.golden.heic b/resources/heic-24bit-exif.RemoveMetadata-darwin-11.golden.heic
diff --git a/resources/heic-orientation-6.AutoRotate_6__heic_to_jpg-darwin-11.golden.jpeg b/resources/heic-orientation-6.AutoRotate_6__heic_to_jpg-darwin-11.golden.jpeg
diff --git a/...s/jpg-24bit-icc-adobe-rgb.OptimizeICCProfile_RGB_Embedded-darwin-11.golden.jpeg b/...s/jpg-24bit-icc-adobe-rgb.OptimizeICCProfile_RGB_Embedded-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit-icc-iec.AutoRotate_1-darwin-11.golden.jpeg b/resources/jpg-24bit-icc-iec.AutoRotate_1-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit-icc-iec.ExtractArea-darwin-11.golden.jpeg b/resources/jpg-24bit-icc-iec.ExtractArea-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit-icc-iec.Modulate-darwin-11.golden.jpeg b/resources/jpg-24bit-icc-iec.Modulate-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit-icc-iec.ModulateHSV-darwin-11.golden.jpeg b/resources/jpg-24bit-icc-iec.ModulateHSV-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit-icc-iec.Rotate-darwin-11.golden.jpeg b/resources/jpg-24bit-icc-iec.Rotate-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit-icc-smpte.RemoveICCProfile-darwin-11.golden.jpeg b/resources/jpg-24bit-icc-smpte.RemoveICCProfile-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.Add-darwin-11.golden.jpeg b/resources/jpg-24bit.Add-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.BandJoinConst-darwin-11.golden.jpeg b/resources/jpg-24bit.BandJoinConst-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.Black-darwin-11.golden.jpeg b/resources/jpg-24bit.Black-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.Decode_JPG-darwin-11.golden.jpeg b/resources/jpg-24bit.Decode_JPG-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.DrawRect-darwin-11.golden.jpeg b/resources/jpg-24bit.DrawRect-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.DrawRectRGBA-darwin-11.golden.jpeg b/resources/jpg-24bit.DrawRectRGBA-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.Embed-darwin-11.golden.jpeg b/resources/jpg-24bit.Embed-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.Flip-darwin-11.golden.jpeg b/resources/jpg-24bit.Flip-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.GaussianBlur-darwin-11.golden.jpeg b/resources/jpg-24bit.GaussianBlur-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.Invert-darwin-11.golden.jpeg b/resources/jpg-24bit.Invert-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.Multiply-darwin-11.golden.jpeg b/resources/jpg-24bit.Multiply-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.OptimizeICCProfile_RGB_No_Profile-darwin-11.golden.jpeg b/resources/jpg-24bit.OptimizeICCProfile_RGB_No_Profile-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.ResizeWithVScale-darwin-11.golden.jpeg b/resources/jpg-24bit.ResizeWithVScale-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.Resize_Downscale-darwin-11.golden.jpeg b/resources/jpg-24bit.Resize_Downscale-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.Resize_Upscale-darwin-11.golden.jpeg b/resources/jpg-24bit.Resize_Upscale-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.SimilarityRGB-darwin-11.golden.jpeg b/resources/jpg-24bit.SimilarityRGB-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.SimilarityRGBA-darwin-11.golden.jpeg b/resources/jpg-24bit.SimilarityRGBA-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.SmartCrop-darwin-11.golden.jpeg b/resources/jpg-24bit.SmartCrop-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.TestImageRef_Divide-darwin-11.golden.jpeg b/resources/jpg-24bit.TestImageRef_Divide-darwin-11.golden.jpeg
diff --git a/resources/jpg-24bit.Zoom-darwin-11.golden.jpeg b/resources/jpg-24bit.Zoom-darwin-11.golden.jpeg
diff --git a/resources/jpg-32bit-cmyk-icc-swop.OptimizeICCProfile_CMYK-darwin-11.golden.jpeg b/resources/jpg-32bit-cmyk-icc-swop.OptimizeICCProfile_CMYK-darwin-11.golden.jpeg
diff --git a/...-8bit-gray-scale-with-icc-profile.OptimizeICCProfile_Grey-darwin-11.golden.jpeg b/...-8bit-gray-scale-with-icc-profile.OptimizeICCProfile_Grey-darwin-11.golden.jpeg
diff --git a/...ey-icc-dot-gain.TestImageRef_RemoveMetadata_Leave_Profile-darwin-11.golden.jpeg b/...ey-icc-dot-gain.TestImageRef_RemoveMetadata_Leave_Profile-darwin-11.golden.jpeg
diff --git a/resources/jpg-8bit-grey-icc-dot-gain.Thumbnail_CropCentered-darwin-11.golden.jpeg b/resources/jpg-8bit-grey-icc-dot-gain.Thumbnail_CropCentered-darwin-11.golden.jpeg
diff --git a/resources/jpg-8bit-grey-icc-dot-gain.Thumbnail_NoCrop-darwin-11.golden.jpeg b/resources/jpg-8bit-grey-icc-dot-gain.Thumbnail_NoCrop-darwin-11.golden.jpeg
diff --git a/resources/jpg-orientation-5.AutoRotate_5-darwin-11.golden.jpeg b/resources/jpg-orientation-5.AutoRotate_5-darwin-11.golden.jpeg
diff --git a/...ientation-5.TestImageRef_RemoveMetadata_Leave_Orientation-darwin-11.golden.jpeg b/...ientation-5.TestImageRef_RemoveMetadata_Leave_Orientation-darwin-11.golden.jpeg
diff --git a/resources/jpg-orientation-6.AutoRotate_6-darwin-11.golden.jpeg b/resources/jpg-orientation-6.AutoRotate_6-darwin-11.golden.jpeg
diff --git a/resources/jpg-orientation-6.AutoRotate_6__jpeg_to_webp-darwin-11.golden.webp b/resources/jpg-orientation-6.AutoRotate_6__jpeg_to_webp-darwin-11.golden.webp
diff --git a/resources/orientation-issue-1.TestImageRef_Orientation_Issue-darwin-11.golden.webp b/resources/orientation-issue-1.TestImageRef_Orientation_Issue-darwin-11.golden.webp
diff --git a/resources/png-24bit+alpha.ModulateHSV_Alpha-darwin-11.golden.png b/resources/png-24bit+alpha.ModulateHSV_Alpha-darwin-11.golden.png
diff --git a/resources/png-24bit+alpha.Modulate_Alpha-darwin-11.golden.png b/resources/png-24bit+alpha.Modulate_Alpha-darwin-11.golden.png
diff --git a/resources/png-24bit+alpha.Sharpen_24bit_Alpha-darwin-11.golden.png b/resources/png-24bit+alpha.Sharpen_24bit_Alpha-darwin-11.golden.png
diff --git a/resources/png-24bit+alpha.TestImageRef_Linear_Alpha-darwin-11.golden.png b/resources/png-24bit+alpha.TestImageRef_Linear_Alpha-darwin-11.golden.png
diff --git a/resources/png-24bit.AutoRotate_0-darwin-11.golden.png b/resources/png-24bit.AutoRotate_0-darwin-11.golden.png
diff --git a/resources/png-24bit.TestImageRef_Linear1-darwin-11.golden.png b/resources/png-24bit.TestImageRef_Linear1-darwin-11.golden.png
diff --git a/resources/png-8bit+alpha.Resize_Downscale_Alpha-darwin-11.golden.png b/resources/png-8bit+alpha.Resize_Downscale_Alpha-darwin-11.golden.png
diff --git a/resources/png-8bit+alpha.Resize_Upscale_Alpha-darwin-11.golden.png b/resources/png-8bit+alpha.Resize_Upscale_Alpha-darwin-11.golden.png
diff --git a/resources/png-8bit+alpha.Sharpen_8bit_Alpha-darwin-11.golden.png b/resources/png-8bit+alpha.Sharpen_8bit_Alpha-darwin-11.golden.png
diff --git a/resources/png-8bit.Decode_PNG-darwin-11.golden.png b/resources/png-8bit.Decode_PNG-darwin-11.golden.png
diff --git a/resources/tif.Tiff-darwin-11.golden.tiff b/resources/tif.Tiff-darwin-11.golden.tiff
diff --git a/resources/with_alpha.ExtractBand-darwin-11.golden.png b/resources/with_alpha.ExtractBand-darwin-11.golden.png
diff --git a/resources/with_alpha.Flatten-darwin-11.golden.png b/resources/with_alpha.Flatten-darwin-11.golden.png
diff --git a/vips/image_golden_test.go b/vips/image_golden_test.go
@@ -566,7 +566,12 @@ func getEnvironment() string {
 	case "windows":
 		return "windows"
 	case "darwin":
-		return "macos"
+		out, err := exec.Command("sw_vers", "-productVersion").Output()
+		if err != nil {
+			return "darwin-unknown"
+		}
+		majorVersion := strings.Split(strings.TrimSpace(string(out)), ".")[0]
+		return "darwin-" + majorVersion
 	case "linux":
 		out, err := exec.Command("lsb_release", "-cs").Output()
 		if err != nil {