Просмотр исходного кода

Merge pull request #443 from aws-lumberyard-dev/Atom/scottmur/script_luac_change

adding a 'c' to the script command line argument so the luac is loaded
jromnoa 3 лет назад
Родитель
Сommit
d35edd9308

+ 2 - 2
Standalone/PythonTests/Automated/benchmark_runner_periodic_suite.py

@@ -37,7 +37,7 @@ class TestPerformanceBenchmarksPeriodicSuite:
                            'AtomSampleViewerStandalone.exe '
                            'AtomSampleViewerStandalone.exe '
                            f'--project-path={workspace.paths.project()} '
                            f'--project-path={workspace.paths.project()} '
                            f'--rhi {rhi} '
                            f'--rhi {rhi} '
-                           f'--runtestsuite scripts/{benchmark_script} '
+                           f'--runtestsuite scripts/{benchmark_script}c '
                            '--exitontestend')
                            '--exitontestend')
 
 
         def teardown():
         def teardown():
@@ -48,7 +48,7 @@ class TestPerformanceBenchmarksPeriodicSuite:
         process_utils.safe_check_call(cmd, stderr=subprocess.STDOUT, encoding='UTF-8', shell=True)
         process_utils.safe_check_call(cmd, stderr=subprocess.STDOUT, encoding='UTF-8', shell=True)
         try:
         try:
             expected_lines = ["Script: Capturing complete."]
             expected_lines = ["Script: Capturing complete."]
-            atomsampleviewer_log_monitor.monitor_log_for_lines(expected_lines, timeout=180)
+            atomsampleviewer_log_monitor.monitor_log_for_lines(expected_lines, timeout=210)
 
 
             aggregator = BenchmarkDataAggregator(workspace, logger, 'periodic')
             aggregator = BenchmarkDataAggregator(workspace, logger, 'periodic')
             aggregator.upload_metrics(rhi)
             aggregator.upload_metrics(rhi)

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

@@ -37,7 +37,7 @@ class TestAutomationMainSuite:
                            'AtomSampleViewerStandalone.exe '
                            'AtomSampleViewerStandalone.exe '
                            f'--project-path={workspace.paths.project()} '
                            f'--project-path={workspace.paths.project()} '
                            f'--rhi {rhi} '
                            f'--rhi {rhi} '
-                           f'--runtestsuite scripts/{test_script} '
+                           f'--runtestsuite scripts/{test_script}c '
                            '--exitontestend')
                            '--exitontestend')
 
 
         def teardown():
         def teardown():