Bläddra i källkod

Merge pull request #6 from aws-lumberyard/rgba16f/EnableCmakePyTestSetup

Add the cmake changes to get the python tests added to the main suite correctly
rgba16f 3 år sedan
förälder
incheckning
93edf97897
2 ändrade filer med 4 tillägg och 2 borttagningar
  1. 2 0
      Project/Code/CMakeLists.txt
  2. 2 2
      Project/Code/PythonTests/CMakeLists.txt

+ 2 - 0
Project/Code/CMakeLists.txt

@@ -40,6 +40,8 @@ ly_add_target(
             AZ::AzCore
 )
 
+add_subdirectory(PythonTests)
+
 # if enabled, LoftSample is used by all kinds of applications
 ly_create_alias(NAME LoftSample.Builders NAMESPACE Gem TARGETS Gem::LoftSample)
 ly_create_alias(NAME LoftSample.Tools    NAMESPACE Gem TARGETS Gem::LoftSample)

+ 2 - 2
Project/Code/PythonTests/CMakeLists.txt

@@ -19,7 +19,7 @@ include(${pal_dir}/PAL_${PAL_PLATFORM_NAME_LOWERCASE}.cmake)
 
 if(PAL_TRAIT_LOFT_SAMPLE_PERF_DX12_TESTS_SUPPORTED)
     ly_add_pytest(
-        NAME LoftSample::PeriodicPerformanceBenchmarks
+        NAME LoftSample::PeriodicPerformanceBenchmarks_DX12
         PATH ${CMAKE_CURRENT_LIST_DIR}/Automated/benchmark_runner_periodic_suite_dx12.py
         TEST_REQUIRES gpu
         TEST_SUITE main
@@ -35,7 +35,7 @@ endif()
 
 if(PAL_TRAIT_LOFT_SAMPLE_PERF_VULKAN_TESTS_SUPPORTED)
     ly_add_pytest(
-        NAME LoftSample::PeriodicPerformanceBenchmarks
+        NAME LoftSample::PeriodicPerformanceBenchmarks_Vulkan
         PATH ${CMAKE_CURRENT_LIST_DIR}/Automated/benchmark_runner_periodic_suite_vulkan.py
         TEST_REQUIRES gpu
         TEST_SUITE main