Feature/urp test maintenance (#30)

H3idi-X · web-flow · commit 4cdf1970ba50 · 2021-08-16T00:11:21.000+09:00
* check urp image comparision tests timeout on yamato

* Updated test projects mainly for Mac.

* deleted hdrp mac test newer than 2020.3 because they cause timeout...
diff --git a/.yamato/osx_metal-hdrp-2019.4.yml b/.yamato/osx_metal-hdrp-2019.4.yml
@@ -5,10 +5,6 @@ test_projects:
   - name: HDRPUTS_GraphicsTest-2019.4
 unity_versions:
   - name: 2019.4
-  - name: 2020.1
-# - name: 2020.2
-#  - name: 2021.1
-#  - name: trunk
 ---
 {% for test_project in test_projects %}
 {% for unity_version in unity_versions %}
diff --git a/.yamato/osx_metal-urp-2019.4.yml b/.yamato/osx_metal-urp-2019.4.yml
@@ -7,7 +7,7 @@ unity_versions:
   - name: 2019.4
   - name: 2020.3
   - name: 2021.1
-#  - name: 2021.2
+  - name: 2021.2
 #  - name: trunk
 ---
 {% for test_project in test_projects %}
diff --git a/TestProjects/HDRPUTS_GraphicsTest-2019.4/Assets/Tests/HDRPUTS_GraphicsTests/HDRPUTS_GraphicsTestSettings.cs b/TestProjects/HDRPUTS_GraphicsTest-2019.4/Assets/Tests/HDRPUTS_GraphicsTests/HDRPUTS_GraphicsTestSettings.cs
@@ -5,11 +5,17 @@ namespace Tests
     public class HDRPUTS_GraphicsTestSettings : GraphicsTestSettings
     {
         public int WaitFrames = 0;
+        public bool XRCompatible = true;
+#if UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
+        public bool CheckMemoryAllocation = false;
+#else
+        public bool CheckMemoryAllocation = true;
+#endif //#if UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
 
         public HDRPUTS_GraphicsTestSettings()
         {
-            ImageComparisonSettings.TargetWidth = 512;
-            ImageComparisonSettings.TargetHeight = 512;
+            ImageComparisonSettings.TargetWidth = 960;
+            ImageComparisonSettings.TargetHeight = 540;
             ImageComparisonSettings.AverageCorrectnessThreshold = 0.005f;
             ImageComparisonSettings.PerPixelCorrectnessThreshold = 0.001f;
             ImageComparisonSettings.UseBackBuffer = false;
diff --git a/TestProjects/HDRPUTS_GraphicsTest-2019.4/Assets/Tests/HDRPUTS_GraphicsTests/HDRPUTS_GraphicsTests.cs b/TestProjects/HDRPUTS_GraphicsTest-2019.4/Assets/Tests/HDRPUTS_GraphicsTests/HDRPUTS_GraphicsTests.cs
@@ -77,11 +77,7 @@ public IEnumerator Run(GraphicsTestCase testCase)
             bool allocatesMemory = false;
             var mainCamera = GameObject.FindGameObjectWithTag("MainCamera").GetComponent<Camera>();
 
-            // 2D Renderer is currently allocating memory, skip it as it will always fail GC alloc tests.
-            //var additionalCameraData = mainCamera.GetHDRPAdditionalCameraData();
-            bool is2DRenderer = false; // additionalCameraData.scriptableRenderer is Renderer2D;
-
-            if (!is2DRenderer)
+            if (settings == null || settings.CheckMemoryAllocation)
             {
                 try
                 {
diff --git a/TestProjects/HDRPUTS_GraphicsTest-2019.4/ProjectSettings/ProjectVersion.txt b/TestProjects/HDRPUTS_GraphicsTest-2019.4/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.4.29f1
-m_EditorVersionWithRevision: 2019.4.29f1 (0eeae20b1d82)
+m_EditorVersion: 2019.4.21f1
+m_EditorVersionWithRevision: 2019.4.21f1 (b76dac84db26)
diff --git a/TestProjects/HDRPUTS_GraphicsTest-2020.3/Assets/Tests/HDRPUTS_GraphicsTests/HDRPUTS_GraphicsTestSettings.cs b/TestProjects/HDRPUTS_GraphicsTest-2020.3/Assets/Tests/HDRPUTS_GraphicsTests/HDRPUTS_GraphicsTestSettings.cs
@@ -5,11 +5,17 @@ namespace Tests
     public class HDRPUTS_GraphicsTestSettings : GraphicsTestSettings
     {
         public int WaitFrames = 0;
+        public bool XRCompatible = true;
+#if UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
+        public bool CheckMemoryAllocation = false;
+#else
+        public bool CheckMemoryAllocation = true;
+#endif //#if UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
 
         public HDRPUTS_GraphicsTestSettings()
         {
-            ImageComparisonSettings.TargetWidth = 512;
-            ImageComparisonSettings.TargetHeight = 512;
+            ImageComparisonSettings.TargetWidth = 960;
+            ImageComparisonSettings.TargetHeight = 540;
             ImageComparisonSettings.AverageCorrectnessThreshold = 0.005f;
             ImageComparisonSettings.PerPixelCorrectnessThreshold = 0.001f;
             ImageComparisonSettings.UseBackBuffer = false;
diff --git a/TestProjects/HDRPUTS_GraphicsTest-2020.3/Assets/Tests/HDRPUTS_GraphicsTests/HDRPUTS_GraphicsTests.cs b/TestProjects/HDRPUTS_GraphicsTest-2020.3/Assets/Tests/HDRPUTS_GraphicsTests/HDRPUTS_GraphicsTests.cs
@@ -77,11 +77,7 @@ public IEnumerator Run(GraphicsTestCase testCase)
             bool allocatesMemory = false;
             var mainCamera = GameObject.FindGameObjectWithTag("MainCamera").GetComponent<Camera>();
 
-            // 2D Renderer is currently allocating memory, skip it as it will always fail GC alloc tests.
-            //var additionalCameraData = mainCamera.GetHDRPAdditionalCameraData();
-            bool is2DRenderer = false; // additionalCameraData.scriptableRenderer is Renderer2D;
-
-            if (!is2DRenderer)
+            if (settings == null || settings.CheckMemoryAllocation)
             {
                 try
                 {
diff --git a/TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/Tests/HDRPUTS_GraphicsTests/HDRPUTS_GraphicsTestSettings.cs b/TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/Tests/HDRPUTS_GraphicsTests/HDRPUTS_GraphicsTestSettings.cs
@@ -5,14 +5,20 @@ namespace Tests
     public class HDRPUTS_GraphicsTestSettings : GraphicsTestSettings
     {
         public int WaitFrames = 0;
+        public bool XRCompatible = true;
+#if UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
+        public bool CheckMemoryAllocation = false;
+#else
+        public bool CheckMemoryAllocation = true;
+#endif //#if UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
 
         public HDRPUTS_GraphicsTestSettings()
         {
-            ImageComparisonSettings.TargetWidth = 512;
-            ImageComparisonSettings.TargetHeight = 512;
+            ImageComparisonSettings.TargetWidth = 960;
+            ImageComparisonSettings.TargetHeight = 540;
             ImageComparisonSettings.AverageCorrectnessThreshold = 0.005f;
             ImageComparisonSettings.PerPixelCorrectnessThreshold = 0.001f;
             ImageComparisonSettings.UseBackBuffer = false;
         }
     }
-}
+}
diff --git a/TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/Tests/HDRPUTS_GraphicsTests/HDRPUTS_GraphicsTests.cs b/TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/Tests/HDRPUTS_GraphicsTests/HDRPUTS_GraphicsTests.cs
@@ -77,11 +77,7 @@ public IEnumerator Run(GraphicsTestCase testCase)
             bool allocatesMemory = false;
             var mainCamera = GameObject.FindGameObjectWithTag("MainCamera").GetComponent<Camera>();
 
-            // 2D Renderer is currently allocating memory, skip it as it will always fail GC alloc tests.
-            //var additionalCameraData = mainCamera.GetHDRPAdditionalCameraData();
-            bool is2DRenderer = false; // additionalCameraData.scriptableRenderer is Renderer2D;
-
-            if (!is2DRenderer)
+            if (settings == null || settings.CheckMemoryAllocation)
             {
                 try
                 {
diff --git a/TestProjects/UniversalUTS_GraphicsTest-2019.4/Assets/Tests/UniversalUTS_GraphicsTests/UniversalUTS_GraphicsTestSettings.cs b/TestProjects/UniversalUTS_GraphicsTest-2019.4/Assets/Tests/UniversalUTS_GraphicsTests/UniversalUTS_GraphicsTestSettings.cs
@@ -5,14 +5,21 @@ namespace Tests
     public class UniversalUTS_GraphicsTestSettings : GraphicsTestSettings
     {
         public int WaitFrames = 0;
+        public bool XRCompatible = true;
+#if UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
+        public bool CheckMemoryAllocation = false;
+#else
+        public bool CheckMemoryAllocation = true;
+#endif //#if UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX
 
         public UniversalUTS_GraphicsTestSettings()
         {
-            ImageComparisonSettings.TargetWidth = 512;
-            ImageComparisonSettings.TargetHeight = 512;
+            ImageComparisonSettings.TargetWidth = 960;
+            ImageComparisonSettings.TargetHeight = 540;
             ImageComparisonSettings.AverageCorrectnessThreshold = 0.005f;
             ImageComparisonSettings.PerPixelCorrectnessThreshold = 0.001f;
             ImageComparisonSettings.UseBackBuffer = false;
+            ImageComparisonSettings.UseBackBuffer = false;
         }
     }
 }
diff --git a/TestProjects/UniversalUTS_GraphicsTest-2019.4/Assets/Tests/UniversalUTS_GraphicsTests/UniversalUTS_GraphicsTests.cs b/TestProjects/UniversalUTS_GraphicsTest-2019.4/Assets/Tests/UniversalUTS_GraphicsTests/UniversalUTS_GraphicsTests.cs
@@ -78,11 +78,7 @@ public IEnumerator Run(GraphicsTestCase testCase)
             bool allocatesMemory = false;
             var mainCamera = GameObject.FindGameObjectWithTag("MainCamera").GetComponent<Camera>();
 
-            // 2D Renderer is currently allocating memory, skip it as it will always fail GC alloc tests.
-            //var additionalCameraData = mainCamera.GetUniversalAdditionalCameraData();
-            bool is2DRenderer = false; // additionalCameraData.scriptableRenderer is Renderer2D;
-
-            if (!is2DRenderer)
+            if (settings == null || settings.CheckMemoryAllocation)
             {
                 try
                 {
diff --git a/TestProjects/UniversalUTS_GraphicsTest-2019.4/Packages/manifest.json b/TestProjects/UniversalUTS_GraphicsTest-2019.4/Packages/manifest.json
@@ -6,10 +6,10 @@
     "com.unity.package-validation-suite": "0.10.0-preview",
     "com.unity.raytracedhardshadow": "https://github.com/unity3d-jp/RaytracedHardShadow.git",
     "com.unity.render-pipelines.universal": "7.5.3",
-    "com.unity.test-framework": "1.1.27",
-    "com.unity.test-framework.build": "0.0.1-preview.12",
+    "com.unity.test-framework": "1.1.18",
+    "com.unity.test-framework.build": "0.0.1-preview.14",
     "com.unity.test-framework.utp-reporter": "1.0.2-preview",
-    "com.unity.testframework.graphics": "7.8.0-preview",
+    "com.unity.testframework.graphics": "7.8.14-preview",
     "com.unity.textmeshpro": "2.1.4",
     "com.unity.toonshader": "file:../../../com.unity.toonshader",
     "com.unity.ugui": "1.0.0",
diff --git a/TestProjects/UniversalUTS_GraphicsTest-2019.4/Packages/packages-lock.json b/TestProjects/UniversalUTS_GraphicsTest-2019.4/Packages/packages-lock.json
@@ -1,20 +1,22 @@
 {
   "dependencies": {
     "com.unity.addressables": {
-      "version": "1.16.15",
+      "version": "1.17.15",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.scriptablebuildpipeline": "1.15.1",
+        "com.unity.scriptablebuildpipeline": "1.17.0",
         "com.unity.modules.assetbundle": "1.0.0",
+        "com.unity.modules.imageconversion": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0",
         "com.unity.modules.unitywebrequest": "1.0.0",
         "com.unity.modules.unitywebrequestassetbundle": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
-      "depth": 1,
+      "depth": 2,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
@@ -97,7 +99,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.scriptablebuildpipeline": {
-      "version": "1.15.1",
+      "version": "1.17.0",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
@@ -120,18 +122,18 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.27",
+      "version": "1.1.18",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.ext.nunit": "1.0.6",
+        "com.unity.ext.nunit": "1.0.0",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework.build": {
-      "version": "0.0.1-preview.12",
+      "version": "0.0.1-preview.14",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -150,18 +152,18 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.testframework.graphics": {
-      "version": "7.8.0-preview",
+      "version": "7.8.14-preview",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.xr.management": "3.2.15",
+        "com.unity.xr.management": "4.0.5",
         "com.unity.external.test-protocol": "1.0.0-preview",
         "com.unity.nuget.newtonsoft-json": "2.0.0-preview",
         "com.unity.subsystemregistration": "1.0.6",
         "com.unity.xr.legacyinputhelpers": "2.1.6",
         "com.unity.modules.xr": "1.0.0",
         "com.unity.modules.vr": "1.0.0",
-        "com.unity.addressables": "1.16.15",
+        "com.unity.addressables": "1.17.15",
         "com.unity.modules.imageconversion": "1.0.0"
       },
       "url": "https://packages.unity.com"
@@ -201,11 +203,14 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.xr.management": {
-      "version": "3.2.17",
+      "version": "4.0.5",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.xr.legacyinputhelpers": "2.1.2",
+        "com.unity.modules.subsystems": "1.0.0",
+        "com.unity.modules.vr": "1.0.0",
+        "com.unity.modules.xr": "1.0.0",
+        "com.unity.xr.legacyinputhelpers": "2.1.7",
         "com.unity.subsystemregistration": "1.0.6"
       },
       "url": "https://packages.unity.com"

Original file line number	Diff line number	Diff line change
`@@ -77,11 +77,7 @@ public IEnumerator Run(GraphicsTestCase testCase)`
`77`	`77`	`bool allocatesMemory = false;`
`78`	`78`	`var mainCamera = GameObject.FindGameObjectWithTag("MainCamera").GetComponent<Camera>();`
`79`	`79`
`80`		`- // 2D Renderer is currently allocating memory, skip it as it will always fail GC alloc tests.`
`81`		`- //var additionalCameraData = mainCamera.GetHDRPAdditionalCameraData();`
`82`		`- bool is2DRenderer = false; // additionalCameraData.scriptableRenderer is Renderer2D;`
`83`		`-`
`84`		`- if (!is2DRenderer)`
	`80`	`+ if (settings == null \|\| settings.CheckMemoryAllocation)`
`85`	`81`	`{`
`86`	`82`	`try`
`87`	`83`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,20 @@ namespace Tests`
`5`	`5`	`public class HDRPUTS_GraphicsTestSettings : GraphicsTestSettings`
`6`	`6`	`{`
`7`	`7`	`public int WaitFrames = 0;`
	`8`	`+ public bool XRCompatible = true;`
	`9`	`+#if UNITY_EDITOR_OSX \|\| UNITY_STANDALONE_OSX`
	`10`	`+ public bool CheckMemoryAllocation = false;`
	`11`	`+#else`
	`12`	`+ public bool CheckMemoryAllocation = true;`
	`13`	`+#endif //#if UNITY_EDITOR_OSX \|\| UNITY_STANDALONE_OSX`
`8`	`14`
`9`	`15`	`public HDRPUTS_GraphicsTestSettings()`
`10`	`16`	`{`
`11`		`- ImageComparisonSettings.TargetWidth = 512;`
`12`		`- ImageComparisonSettings.TargetHeight = 512;`
	`17`	`+ ImageComparisonSettings.TargetWidth = 960;`
	`18`	`+ ImageComparisonSettings.TargetHeight = 540;`
`13`	`19`	`ImageComparisonSettings.AverageCorrectnessThreshold = 0.005f;`
`14`	`20`	`ImageComparisonSettings.PerPixelCorrectnessThreshold = 0.001f;`
`15`	`21`	`ImageComparisonSettings.UseBackBuffer = false;`
`16`	`22`	`}`
`17`	`23`	`}`
`18`		`-}`
	`24`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,21 @@ namespace Tests`
`5`	`5`	`public class UniversalUTS_GraphicsTestSettings : GraphicsTestSettings`
`6`	`6`	`{`
`7`	`7`	`public int WaitFrames = 0;`
	`8`	`+ public bool XRCompatible = true;`
	`9`	`+#if UNITY_EDITOR_OSX \|\| UNITY_STANDALONE_OSX`
	`10`	`+ public bool CheckMemoryAllocation = false;`
	`11`	`+#else`
	`12`	`+ public bool CheckMemoryAllocation = true;`
	`13`	`+#endif //#if UNITY_EDITOR_OSX \|\| UNITY_STANDALONE_OSX`
`8`	`14`
`9`	`15`	`public UniversalUTS_GraphicsTestSettings()`
`10`	`16`	`{`
`11`		`- ImageComparisonSettings.TargetWidth = 512;`
`12`		`- ImageComparisonSettings.TargetHeight = 512;`
	`17`	`+ ImageComparisonSettings.TargetWidth = 960;`
	`18`	`+ ImageComparisonSettings.TargetHeight = 540;`
`13`	`19`	`ImageComparisonSettings.AverageCorrectnessThreshold = 0.005f;`
`14`	`20`	`ImageComparisonSettings.PerPixelCorrectnessThreshold = 0.001f;`
`15`	`21`	`ImageComparisonSettings.UseBackBuffer = false;`
	`22`	`+ ImageComparisonSettings.UseBackBuffer = false;`
`16`	`23`	`}`
`17`	`24`	`}`
`18`	`25`	`}`