birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,554 Commits 3 Branches 3 Tags
7dfd790de26364f94993fc5ed41a7d12b7afa475
Commit Graph

822 Commits

Author SHA1 Message Date
jromnoa 2329e4302f Merge branch 'development' into Atom/jromnoa/assert-for-screenshot-comparisons 2021-11-01 21:10:16 -07:00
Gene Walters 2a3667f7b0 Merge branch 'upstream/development' into LYN-6770_AutomatedTestNetInputs 2021-11-01 20:23:27 -07:00
Neil Widmaier 4a57b13a0e Adding P0 Occlusion Culling Plane test 
Signed-off-by: Neil Widmaier <nwidmaie@amazon.com>
 2021-11-01 17:11:07 -07:00
chiyenteng 6862b52069 Convert several physics automated tests with Base test level file converted to prefab file (#5138) 
* Convert some physics automated tests to use prefab system

Signed-off-by: chiyteng <chiyteng@amazon.com>

* revert changes

Signed-off-by: chiyteng <chiyteng@amazon.com>

* Fix file names

Signed-off-by: chiyteng <chiyteng@amazon.com>
 2021-11-01 14:27:22 -07:00
Gene Walters fa32940205 Adding logs to dedicated-server start up (unable to use for automated testing just yet since remote console cant be connected that early). Adding pytest check to make sure AutomatedTesting.ServerLauncher is running. Moved sveditor_port to MultiplayerEditorConnection since it was never actually getting used when it was in EditorSystemComponent (dedicated servers dont know about editor) 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-11-01 13:01:59 -07:00
AMZN-ScottR 2d7c6af97c Merge branch 'development' into profiler_capture_api 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-10-29 17:21:29 -07:00
Sean Sweeney ea4bc31b38 Merge pull request #4675 from aws-lumberyard-dev/editor_test_tools_cleanup 
Editor test tools cleanup
 2021-10-29 15:47:26 -07:00
AMZN-AlexOteiza e871dff70e Added two complex prefab tests (#5089) 
* Added two complex prefab tests

* Fix compile error

* Added extra methods, fixed test failure

* Addressed PR commments

* More PR comments

* Fix space

* Fix ar error
 2021-10-29 22:32:33 +01:00
Gene Walters 2f38873e03 Adding logs for successful steps occurring in the editor-server process. AutomatedTesting will expect these logs and can be helpful to narrow down any test fails 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-29 13:55:32 -07:00
jromnoa 7b5a5b8f74 Merge pull request #5106 from aws-lumberyard-dev/Atom/scottm/cleanup_import 
Test parallel PostFX Layer remove and unused import
 2021-10-29 10:35:40 -07:00
AMZN-ScottR 9bc0422f0b [profiler_capture_api] added trailing newlines to a couple new files 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-10-28 14:39:17 -07:00
Allen Jackson 29f5fb1271 {lyn7352} adding more logging around mock_asset_builder.py (#5103) 
o3de\AutomatedTesting\Gem\PythonTests\PythonAssetBuilder\mock_asset_builder.py
- adding more logging
- updated keys for platforms (pc, server)

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
 2021-10-28 16:38:27 -05:00
AMZN-ScottR e67db19a63 [profiler_capture_api] add sample python script to test Profiler System interface bindings 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-10-28 14:26:22 -07:00
Scott Murray 7536073df0 remove and unused import 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2021-10-28 13:36:48 -07:00
Gene Walters 6d673643be Re-merging latest dev after rebasing to fix DCO. Re-resolving conflicts 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-28 09:56:01 -07:00
Gene Walters 131c415404 small fix: adding newline back to end of a merged file 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-28 09:47:12 -07:00
Allen Jackson 63308c942a {lyn7677} updated test modules to pass AssetPipelineTests on Linux (#5017) 
* {lyn7677} updated test modules to pass AssetPipelineTests on Linux

Fixes for Python AssetPipelineTests modules fail on Linux

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* Separating the Linux and Mac concerns

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-28 09:46:46 -07:00
sweeneys 0b9c792fda Fix AzTestRunner with correct lib 
Signed-off-by: sweeneys <sweeneys@amazon.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-28 09:46:38 -07:00
sweeneys b9486036c3 Fix AzTestRunner smoke test on Linux 
Signed-off-by: sweeneys <sweeneys@amazon.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-28 09:46:36 -07:00
Scott Murray 12784c4ada test cleanup and adding AtomComponentProperties 
Signed-off-by: Scott Murray <scottmur@amazon.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-28 09:45:38 -07:00
SJ 104170879e Pass relative path IsFileExcluded so that only paths relative to the root scan folder are matched against the exclude filters (#4504) 
* Pass relative path IsFileExcluded so that only paths relative to the root scan folder are matched against the exclude filters.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Revert previous change. Remove the exclude filter for the Install directory.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Pass in relative path to the exclude filter as before. Fix the AssetScanner tests.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Prepend a ./ to the relative path in order to match the exclude patterns

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove hack to prepend ./. Update the exclude patterns so that the hack is no longer required.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add missing ? and remove whitespace

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. IsFileExcluded() now converts the input path to a path that's relative to its corresponding scan folder.
2. Update regex patterns in gems and AutomatedTesting as well.
3. Remove unnecessary escaping for '/'.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Use ConvertToRelativePath() function to compute path relative to a scan folder.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* More fixes to regex patterns

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove test case which tests a hypothetical scenario that cannot occur. Fix another test case by adding scan folder.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove assert that's not needed since it's a valid scenario

Signed-off-by: amzn-sj <srikkant@amazon.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-28 09:45:27 -07:00
amzn-mike 769e2e3942 Add serialized output version (xml) of debug scene graph (#3437) 
* Add serialized output version (xml) of debug scene graph

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix line endings

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix line endings

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Update fbx unit tests to check for dbgsg.xml file

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add dbgsg.xml comparison

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Move dbgsg files to SceneDebug sub folder

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add shaderball.dbgsg.xml and multiple_mesh_multiple_material_override.dbgsg.xml

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add shaderball dbgsg.xml product.

Update code to look in SceneDebug for dbgsg files
Fix extension concatenation

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Remove unnecessary dbgsg.xml file

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-28 09:45:24 -07:00
LesaelR b4f42b599a Adding Shaderball test and asset files. (#4743) 
Signed-off-by: Rosario Cox <lesaelr@amazon.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-28 09:44:45 -07:00
santorac 6da17abba4 Made material property auto-rename procedure apply to Material Component at runtime. This ensures that an material property overrides and any gameplay scripts that work with property overrides can get the benefit of the material type version update procedure. 
I added an ApplyPropertyRenames function to MaterialTypeAsset very similar to the one in MaterialTypeSourceData.
Updated the MaterialAssignment class to apply any property renames when it discovers the old name doesn't work. This will be written to disk when the level or prefab is saved.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-28 09:44:32 -07:00
Gene Walters 48c438f469 Reverting the debugging code I was using to narrow down the problem on Jenkins now that the issue was fixed by PR-4946 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-28 09:42:13 -07:00
Gene Walters c9a02e3c8a Revert "Lowering timeout so pytest doesnt abort, but still get mode time to read the server logs" 
This reverts commit 8380c5ff24.

Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-28 09:42:10 -07:00
jromnoa 568d9a3f36 Merge pull request #5069 from aws-lumberyard-dev/Neil_o3de_local 
Adding the Hydra P0 Grid component test, and including it in the Test…
 2021-10-27 17:33:50 -07:00
Neil Widmaier 308fcd8bf2 Adding the Hydra P0 Grid component test, and including it in the Test_Suite_Main_Optomized. 
Signed-off-by: Neil Widmaier <nwidmaie@amazon.com>
 2021-10-27 14:53:20 -07:00
Allen Jackson af7bb2332f {lyn7677} updated test modules to pass AssetPipelineTests on Linux (#5017) 
* {lyn7677} updated test modules to pass AssetPipelineTests on Linux

Fixes for Python AssetPipelineTests modules fail on Linux

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* Separating the Linux and Mac concerns

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
 2021-10-27 08:15:35 -05:00
jromnoa 6d62dbba76 fixes the basic level GPU test screenshot comparison failure 
Signed-off-by: jromnoa <jromnoa@amazon.com>
 2021-10-26 18:51:09 -07:00
Sean Sweeney 56a1d4ff44 Merge pull request #4988 from aws-lumberyard-dev/aztestrunner_smoke 
Fix AzTestRunner smoke test on Linux
 2021-10-26 16:50:07 -07:00
jromnoa 8f66b0765e Merge pull request #4933 from aws-lumberyard-dev/Atom/scottmur/test_cleanup 
Atom parallel test cleanup and adding AtomComponentProperties
 2021-10-26 14:02:18 -07:00
evanchia 7c25cb6d5a addressing minor details in feedback 
Signed-off-by: evanchia <evanchia@amazon.com>
 2021-10-26 10:37:39 -07:00
SJ 3bdfe51fca Pass relative path IsFileExcluded so that only paths relative to the root scan folder are matched against the exclude filters (#4504) 
* Pass relative path IsFileExcluded so that only paths relative to the root scan folder are matched against the exclude filters.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Revert previous change. Remove the exclude filter for the Install directory.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Pass in relative path to the exclude filter as before. Fix the AssetScanner tests.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Prepend a ./ to the relative path in order to match the exclude patterns

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove hack to prepend ./. Update the exclude patterns so that the hack is no longer required.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add missing ? and remove whitespace

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. IsFileExcluded() now converts the input path to a path that's relative to its corresponding scan folder.
2. Update regex patterns in gems and AutomatedTesting as well.
3. Remove unnecessary escaping for '/'.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Use ConvertToRelativePath() function to compute path relative to a scan folder.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* More fixes to regex patterns

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove test case which tests a hypothetical scenario that cannot occur. Fix another test case by adding scan folder.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove assert that's not needed since it's a valid scenario

Signed-off-by: amzn-sj <srikkant@amazon.com>
 2021-10-26 11:43:03 -05:00
amzn-mike ee6ceba5ce Add serialized output version (xml) of debug scene graph (#3437) 
* Add serialized output version (xml) of debug scene graph

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix line endings

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix line endings

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Update fbx unit tests to check for dbgsg.xml file

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add dbgsg.xml comparison

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Move dbgsg files to SceneDebug sub folder

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add shaderball.dbgsg.xml and multiple_mesh_multiple_material_override.dbgsg.xml

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add shaderball dbgsg.xml product.

Update code to look in SceneDebug for dbgsg files
Fix extension concatenation

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Remove unnecessary dbgsg.xml file

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-10-26 09:07:22 -07:00
sweeneys dd49798596 Fix AzTestRunner with correct lib 
Signed-off-by: sweeneys <sweeneys@amazon.com>
 2021-10-25 18:54:01 -07:00
sweeneys fa6b1d1d65 Fix AzTestRunner smoke test on Linux 
Signed-off-by: sweeneys <sweeneys@amazon.com>
 2021-10-25 18:50:34 -07:00
LesaelR 079e684b77 Adding Shaderball test and asset files. (#4743) 
Signed-off-by: Rosario Cox <lesaelr@amazon.com>
 2021-10-25 10:05:07 -07:00
Gene Walters 2f651c05c8 Python passes lower-case net-player-prefab path. 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-24 23:28:10 -07:00
Gene Walters 8380c5ff24 Lowering timeout so pytest doesnt abort, but still get mode time to read the server logs 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-23 16:41:30 -07:00
Gene Walters 3d7346ac32 increasing multiplayer is-in-game timeout, going to try this on Jenkin. Maybe AssetProcessor isn't finished and thats why its failing? 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-23 16:02:41 -07:00
Gene Walters 6ef6164ad8 merging latest dev 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-10-22 17:00:47 -07:00
santorac cef1e200f6 Merge remote-tracking branch 'upstream/development' into Atom/santorac/MaterialPropertyRenameInMaterialComponent 2021-10-22 16:42:09 -07:00
Scott Murray e28bf7179f test cleanup and adding AtomComponentProperties 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2021-10-22 16:17:49 -07:00
jromnoa 267d690171 Merge pull request #4770 from aws-lumberyard-dev/Atom/scottmur/Atom-16561 
AtomComponentProperties class for atom_constants to store property paths and other constant values
 2021-10-22 11:56:22 -07:00
santorac 0972c4f1a3 Merge remote-tracking branch 'upstream/development' into Atom/santorac/MaterialPropertyRenameInMaterialComponent 2021-10-22 09:27:24 -07:00
allisaurus 136788bccf Update env var setting instructions in AWS Gem test README (#4791) 
Signed-off-by: Stanko <stankoa@amazon.com>
 2021-10-22 08:53:40 -07:00
santorac c6b209ace0 Made material property auto-rename procedure apply to Material Component at runtime. This ensures that an material property overrides and any gameplay scripts that work with property overrides can get the benefit of the material type version update procedure. 
I added an ApplyPropertyRenames function to MaterialTypeAsset very similar to the one in MaterialTypeSourceData.
Updated the MaterialAssignment class to apply any property renames when it discovers the old name doesn't work. This will be written to disk when the level or prefab is saved.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-10-21 23:18:08 -07:00
evanchia 670e9a1fa1 merge with development 
Signed-off-by: evanchia <evanchia@amazon.com>
 2021-10-21 14:56:16 -07:00
jromnoa 6c1b2fa84c Merge pull request #4883 from aws-lumberyard-dev/Atom/jromnoa/fix-atom-testsuite-main-gpu-AR-logs 
Fix log lines in main GPU tests for Atom
 2021-10-21 14:43:30 -07:00