浏览代码

Fix Script case

Signed-off-by: Shirang Jia <[email protected]>
Shirang Jia 2 年之前
父节点
当前提交
e94a1c4af9

+ 2 - 2
Gem/Code/Source/Automation/ScriptManager.h

@@ -137,11 +137,11 @@ namespace AtomSampleViewer
         static void Script_SelectImageComparisonToleranceLevel(const AZStd::string& toleranceLevelName);
 
         // All of the following functions capture a frame and save it to the given file path.
-        // The path must be under the "Scripts/Screenshots" folder and have extension ".ppm".
+        // The path must be under the "scripts/Screenshots" folder and have extension ".ppm".
         // If screenshot comparison testing is enabled, this will also check the captured image against a
         // baseline image file. The function will assume the corresponding expected image will be in a similar path,
         // but with "Screenshots" replaced with "ExpectedScreenshots". For example, the expected file for
-        // "Scripts/Screenshots/StandardPbr/test.ppm" should be at "Scripts/ExpectedScreenshots/StandardPbr/test.ppm".
+        // "scripts/Screenshots/StandardPbr/test.ppm" should be at "scripts/ExpectedScreenshots/StandardPbr/test.ppm".
 
         static void Script_CaptureScreenshot(const AZStd::string& imageName);
         static void Script_CaptureScreenshotWithImGui(const AZStd::string& imageName);

+ 3 - 3
Standalone/PythonTests/Automated/test_AtomSampleViewer_main_suite.py

@@ -30,7 +30,7 @@ class TestAutomationMainSuite:
     def test_AutomatedReviewTestSuite(self, request, workspace, launcher_platform, rhi, atomsampleviewer_log_monitor):
         # Script call setup.
         test_script = '_FullTestSuite_.bv.lua'
-        test_script_path = os.path.join(workspace.paths.project(), 'Scripts', test_script)
+        test_script_path = os.path.join(workspace.paths.project(), 'scripts', test_script)
         if not os.path.exists(test_script_path):
             raise AtomSampleViewerException(f'Test script does not exist in path: {test_script_path}')
         cmd = os.path.join(workspace.paths.build_directory(),
@@ -55,9 +55,9 @@ class TestAutomationMainSuite:
                 unexpected_lines=unexpected_lines, halt_on_unexpected=True, timeout=400)
         except ly_test_tools.log.log_monitor.LogMonitorException as e:
             expected_screenshots_path = os.path.join(
-                workspace.paths.project(), "Scripts", "ExpectedScreenshots")
+                workspace.paths.project(), "scripts", "ExpectedScreenshots")
             test_screenshots_path = os.path.join(
-                workspace.paths.project(), "user", "Scripts", "Screenshots")
+                workspace.paths.project(), "user", "scripts", "Screenshots")
             raise AtomSampleViewerException(
                 f"Got error: {e}\n"
                 f"Screenshot comparison check failed using Render Hardware Interface (RHI): '{rhi}'\n"

+ 31 - 31
atomsampleviewer_asset_files.cmake

@@ -26,37 +26,37 @@ set(FILES
     Passes/RHISamplePipeline.pass
     Passes/SelectorPass.pass
     Passes/SsaoPipeline.pass
-    Scripts/AreaLightTest.bv.lua
-    Scripts/AuxGeom.bv.lua
-    Scripts/CheckerboardTest.bv.lua
-    Scripts/CullingAndLod.bv.lua
-    Scripts/Decals.bv.lua
-    Scripts/DepthOfFieldTest.bv.lua
-    Scripts/DiffuseGITest.bv.lua
-    Scripts/DynamicDraw.bv.lua
-    Scripts/DynamicMaterialTest.bv.lua
-    Scripts/ExposureTest.bv.lua
-    Scripts/EyeMaterialTest.bv.lua
-    Scripts/LightCulling.bv.lua
-    Scripts/MaterialScreenshotTests.bv.lua
-    Scripts/MSAA_RPI_Test.bv.lua
-    Scripts/MultiRenderPipeline.bv.lua
-    Scripts/MultiScene.bv.lua
-    Scripts/ParallaxDepthArtifacts.bv.lua
-    Scripts/ParallaxTest.bv.lua
-    Scripts/PassTree.bv.lua
-    Scripts/ReadbackTest.bv.lua
-    Scripts/RenderTargetTexture.bv.lua
-    Scripts/SceneReloadSoakTest.bv.lua
-    Scripts/ShaderReloadSoakTest.bv.lua
-    Scripts/ShadowedSponzaTest.bv.lua
-    Scripts/ShadowTest.bv.lua
-    Scripts/SkinnedMesh.bv.lua
-    Scripts/StreamingImageTest.bv.lua
-    Scripts/TestEnvironment.lua
-    Scripts/TransparentTest.bv.lua
-    Scripts/_AutomatedPeriodicBenchmarkSuite_.bv.lua
-    Scripts/_FullTestSuite_.bv.lua
+    scripts/AreaLightTest.bv.lua
+    scripts/AuxGeom.bv.lua
+    scripts/CheckerboardTest.bv.lua
+    scripts/CullingAndLod.bv.lua
+    scripts/Decals.bv.lua
+    scripts/DepthOfFieldTest.bv.lua
+    scripts/DiffuseGITest.bv.lua
+    scripts/DynamicDraw.bv.lua
+    scripts/DynamicMaterialTest.bv.lua
+    scripts/ExposureTest.bv.lua
+    scripts/EyeMaterialTest.bv.lua
+    scripts/LightCulling.bv.lua
+    scripts/MaterialScreenshotTests.bv.lua
+    scripts/MSAA_RPI_Test.bv.lua
+    scripts/MultiRenderPipeline.bv.lua
+    scripts/MultiScene.bv.lua
+    scripts/ParallaxDepthArtifacts.bv.lua
+    scripts/ParallaxTest.bv.lua
+    scripts/PassTree.bv.lua
+    scripts/ReadbackTest.bv.lua
+    scripts/RenderTargetTexture.bv.lua
+    scripts/SceneReloadSoakTest.bv.lua
+    scripts/ShaderReloadSoakTest.bv.lua
+    scripts/ShadowedSponzaTest.bv.lua
+    scripts/ShadowTest.bv.lua
+    scripts/SkinnedMesh.bv.lua
+    scripts/StreamingImageTest.bv.lua
+    scripts/TestEnvironment.lua
+    scripts/TransparentTest.bv.lua
+    scripts/_AutomatedPeriodicBenchmarkSuite_.bv.lua
+    scripts/_FullTestSuite_.bv.lua
     Shaders/DebugVertexNormals.azsl
     Shaders/DebugVertexNormals.materialtype
     Shaders/DebugVertexNormals.shader

+ 3 - 3
scripts/TestEnvironment.lua

@@ -1,9 +1,9 @@
 g_renderApiName = GetRenderApiName()
 
-g_screenshotOutputFolder = '@user@/Scripts/Screenshots/'
+g_screenshotOutputFolder = '@user@/scripts/Screenshots/'
 testEnv = GetRenderApiName()
 
 SetScreenshotFolder(g_screenshotOutputFolder)
 SetTestEnvPath(testEnv)
-SetLocalBaselineImageFolder('@user@/Scripts/Screenshotslocalbaseline/')
-SetOfficialBaselineImageFolder('@projectroot@/Scripts/Expectedscreenshots/')
+SetLocalBaselineImageFolder('@user@/scripts/Screenshotslocalbaseline/')
+SetOfficialBaselineImageFolder('@projectroot@/scripts/Expectedscreenshots/')

+ 1 - 1
scripts/_AutomatedPeriodicBenchmarkSuite_.bv.lua

@@ -8,7 +8,7 @@
 --
 --
 ----------------------------------------------------------------------------------------------------
-g_baseFolder = ResolvePath('@user@/Scripts/PerformanceBenchmarks/')
+g_baseFolder = ResolvePath('@user@/scripts/PerformanceBenchmarks/')
 IDLE_COUNT = 100
 FRAME_COUNT = 100
 SAMPLES_TO_RUN = {

+ 1 - 1
scripts/build/Jenkins/Jenkinsfile

@@ -472,7 +472,7 @@ def ExportTestResults(Map options, String platform, String type, String workspac
 def ExportTestScreenshots(Map options, String branchName, String platformName, String jobName, String workspace, Map params) {
     catchError(message: "Error exporting test screenshots (this won't fail the build)", buildResult: 'SUCCESS', stageResult: 'FAILURE') {
         dir("${workspace}/${ENGINE_REPOSITORY_NAME}") {
-            def screenshotsFolder = "${workspace}/${PROJECT_REPOSITORY_NAME}/user/Scripts/Screenshots"
+            def screenshotsFolder = "${workspace}/${PROJECT_REPOSITORY_NAME}/user/scripts/Screenshots"
             def s3Uploader = "scripts/build/tools/upload_to_s3.py"
             def command = "${options.PYTHON_DIR}/python.cmd -u ${s3Uploader} --base_dir ${screenshotsFolder} " +
                           '--file_regex \\"(.*\$)\\" ' +