Commit Graph

641 Commits

Author SHA1 Message Date
AMZN-stankowi 6d592d78cd Fixes for release builds with DCO fix (#5164)
* This set of changes is work toward allowing release builds to work with asset bundler generated bundles and legacy, non-prefab levels. This requires some other in-flight changes before this work is complete.

    Updated engine seed list + fixed automated test
    ComponentApplicationLifecycle has the ability to automatically register events if asked to register a handler and the event doesn't exist. This is only intended for cases where you need to register a handler early in startup before the settings registry file is loaded.
    Added two new lifecycle events: One after the system entity has been activated, and one after the system interface has been created.
    If you load an archive before the system entity has been activated, archive.cpp caches information about those archives until that time, so it can finish registration. This is because the serialization system and BundlingSystemComponent both need to be available to do this registration, but the bundles have to be loaded before those are initialized so that the settings registry file can be loaded.
    Fixed an error were mounted pak files were searching for levels.pak and not level.pak, and not finding them. I'm pretty sure this logic doesn't do anything functional either way, but I've been testing legacy levels with this change and they work now.
    Moved wildcard pak loading to where engine.pak is loaded. This is because the settings registry file that defines the IO stack to spin up must be available early in application startup, and this file must be within a mounted pak file. If you're using asset bundler generated bundles, they need to be loaded at this time so that file can be loaded.
    Atom's BootstrapSystemComponent.cpp no longer initializes on AssetCatalogLoaded, and instead initializes on the ApplicationLifecycle event SystemInterfaceCreated. This is because the base assetcatalog.xml file is really just a development time concept, this file should not be used in packaged release builds, because those builds will make use of delta catalogs in each bundle loaded. The asset catalog contains the list of all assets that were in the cache at development time, and this contains content that developers don't want to ship, and they may want to specifically hide from their customers, so data miners don't find secrets about upcoming game content.

Recovering from a branch that had incorrect DCO

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed an incorrect ebus disconnect and removed an include that's no longer needed

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed a copy and paste typo from trying to recover the previous pull request

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated product IDs for the settings registry builder to no longer collide with the JSON builder. Now they are based on a hash of the configuration.
Updated the engine default seed list to include the new asset ID info for the renamed bootstrap file

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated the path to the application lifecycle events, because runtime settings aren't included in the merged bootstrap file.
Addressed some feedback on printing out a string view on an error

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Removed a test that uses old assets that aren't relevant. We may not need this test anymore, but if we do we've backlogged a task to create a new test to cover this behavior without using old assets.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Renamed SystemInterfaceCreated event to LegacySystemInterfaceCreated
Removed SystemEntityActivated event. Now that I have the rest of the fixes in this pull request, this new event wasn't needed, the already existing SystemComponentsActivated event does what I need.
Changed list to vector

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2021-11-02 09:03:38 -07:00
Scott Romero 797b8248e5 [development] Consolidated programmatic profiler capture API (#4969)
Merged overlapping profiler EBuses/Interfaces into AzCore
Fixed ambiguous LogLevel type in some unity file scenarios
Added cvar/console access for profiler capture
Added utilities for reflecting AZ::Interfaces through the BehaviorContext
Included profiler system sample python script

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2021-11-02 09:00:15 -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
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
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
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
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
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
AMZN-AlexOteiza ea442b80d1 Renamed ctest_pytest.ini to pytest.ini so it is used by default, added TestSuite_ as collection file (#4822)
* Fixed warnings of unused marks, renamed ctest_pytest.ini to pytest.ini to better consistency on runs

* Fixed some test suites to run propertly

* Fix missing arguments

* Fixed missing cmakelists and renamed missing file

* Temp disable editor_testing_tests as timeout in jenkins
2021-10-21 22:03:18 +01:00
jromnoa 94f54e8586 re-add the 'Captured data successfully.' log line to test_AtomFeatureIntegrationBenchmark() test, removed on accident
Signed-off-by: jromnoa <jromnoa@amazon.com>
2021-10-21 12:52:05 -07:00
jromnoa 3fc32675fd removes general.log() checks for pass/fail status as these do not appear in AR and only appear locally
Signed-off-by: jromnoa <jromnoa@amazon.com>
2021-10-21 12:39:09 -07:00
chiyenteng 7316802941 Add Detach and Duplicate Prefab basic workflow auto test (#4506)
- Add a new automated test PrefabBasicWorkflow_CreateReparentAndDetachPrefab for verifying prefab detachment basic workflow.
- Add a new automated test PrefabBasicWorkflow_CreateAndDuplicatePrefab for verifying prefab detachment basic workflow.
- Fix a bug related to sets of entity ids in Reparent helper function .
2021-10-21 12:08:00 -07:00
evanchia 11c31cb5ca removed platform specific tests and consolodated
Signed-off-by: evanchia <evanchia@amazon.com>
2021-10-21 10:48:33 -07:00
jckand-amzn 3a6cc2498b Skipping GraphUpdate test due to LC node issue in Debug configuration (#4847)
* Skipping GraphUpdate test due to LC node issue in Debug configuration

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

* Reverting test type for GraphUpdates test to EditorSharedTest

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

* Updating xfail reason for GraphUpdates test with GitHub issue link

Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-10-21 09:16:48 -07:00
Scott Murray 0c7e732527 removing return type Union which is not supported
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-20 14:20:49 -07:00
Scott Murray 2c0e78cb0d more development freshening
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-20 13:30:56 -07:00
Sean Sweeney 26f23cc3a5 Merge pull request #4836 from aws-lumberyard-dev/flakytest
Moved atom flaky tests to sandbox
2021-10-20 13:21:59 -07:00
AMZN-AlexOteiza af27906598 Moved atom flaky tests to sandbox 2021-10-20 20:00:53 +01:00
Scott Murray eb41ec5978 bringing in latest development
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-20 11:24:32 -07:00
LesaelR 67532ed18f Updating FBX_Tests and test asset files (#4477)
* Updating FBX_Tests and test asset files

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

* Updating fbx_tests to removed marker from helper function.

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

* Update to add Motion Test to FBX Tests.

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

* Update fbx_tests.py

Removing unnecessary sandbox mark.

Signed-off-by: LesaelR <LesaelR@amazon.com>
2021-10-20 13:12:38 -05:00
AMZN-AlexOteiza 7ccde16b0d Rename prefab -> Prefab (#4825)
* Rename part 1

* Rename part 2

* Rename part 3
2021-10-20 18:50:47 +01:00
AMZN-AlexOteiza 181d12625f Reorganized Prefab tests and standarization (#4786)
* Reorganized Prefab tests and standarization

* Restore changed file by accident
2021-10-20 16:16:04 +01:00
AMZN-AlexOteiza 38f9dcb8ca Added option to reopen if the current level is the same. This contributes to stability for batched tests (#4043)
* Added option to reopen if the current level is the same. This contributes to stability for batched tests

Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>

* Addressed PR comments

* Addressed PR and cleaned Base level that had an entity by accident

Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>

* Cleaned up params

Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>

* Addressed PR comments
2021-10-20 14:55:20 +01:00
evanchia 64a20c45b5 adding editor integ tests to AR
Signed-off-by: evanchia <evanchia@amazon.com>
2021-10-19 15:51:44 -07:00
Scott Murray 5bc334be70 updating docstrings for formatting and typos
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-10-19 11:21:00 -07:00
AMZN-ScottR 1b1ef46d9d Merge branch 'development' into atom_cpu_profiler_gem_promotion
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-10-19 10:58:35 -07:00
jonawals 0031016548 Merge pull request #4785 from aws-lumberyard-dev/pytest_editor_testcase_name_fix
Fix for PyTest editor test case names.
2021-10-19 16:13:56 +01:00
amzn-sean 82b731b673 Increase the timeout for ForceRegion_LinearDampingForceOnRigidBodies. (#4784)
The Test runs with a wait_for_condition, and the original timeout was right on the edge of how long the test takes to reach that condition.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-10-19 13:59:00 +01:00