From 8f5467d3c605c8fe5c49e5c66c14aed3b9eaa647 Mon Sep 17 00:00:00 2001 From: Artur Harasimiuk Date: Fri, 20 May 2022 17:24:17 +0000 Subject: [PATCH] test: create working dir for tests Signed-off-by: Artur Harasimiuk --- cmake/run_ult_target.cmake | 3 +++ level_zero/core/test/unit_tests/main.cpp | 6 +++++- opencl/test/unit_test/CMakeLists.txt | 4 ++-- opencl/test/unit_test/main.cpp | 6 +++++- shared/test/unit_test/main.cpp | 3 ++- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/cmake/run_ult_target.cmake b/cmake/run_ult_target.cmake index 2da85f2e18..2e710fa113 100644 --- a/cmake/run_ult_target.cmake +++ b/cmake/run_ult_target.cmake @@ -33,6 +33,7 @@ if(NOT NEO_SKIP_SHARED_UNIT_TESTS) COMMAND WORKING_DIRECTORY ${TargetDir} COMMAND echo Running neo_shared_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir} COMMAND echo Cmd line: $ --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${GTEST_OUTPUT} ${NEO_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} --rev_id ${revision_id} + COMMAND ${CMAKE_COMMAND} -E make_directory ${TargetDir}/shared/${product}/${revision_id} COMMAND ${NEO_RUN_INTERCEPTOR_LIST} $ --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${GTEST_OUTPUT} ${NEO_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} --rev_id ${revision_id} ) @@ -113,6 +114,8 @@ if(NOT NEO_SKIP_L0_UNIT_TESTS AND BUILD_WITH_L0) TARGET run_${product}_${revision_id}_l0_tests POST_BUILD COMMAND WORKING_DIRECTORY ${TargetDir} + COMMAND echo create working directory ${TargetDir}/level_zero/${product}/${revision_id} + COMMAND ${CMAKE_COMMAND} -E make_directory ${TargetDir}/level_zero/${product}/${revision_id} COMMAND echo Running ze_intel_gpu_core_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir} COMMAND echo Cmd line: ${NEO_RUN_INTERCEPTOR_LIST} $ --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${GTEST_OUTPUT_CORE} ${NEO_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} --rev_id ${revision_id} COMMAND ${NEO_RUN_INTERCEPTOR_LIST} $ --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${GTEST_OUTPUT_CORE} ${NEO_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} --rev_id ${revision_id} diff --git a/level_zero/core/test/unit_tests/main.cpp b/level_zero/core/test/unit_tests/main.cpp index 5590b9f8a9..a9ef03c9c1 100644 --- a/level_zero/core/test/unit_tests/main.cpp +++ b/level_zero/core/test/unit_tests/main.cpp @@ -344,7 +344,11 @@ int main(int argc, char **argv) { testFiles = testBinaryFiles; testFilesApiSpecific = testBinaryFilesApiSpecific; - std::string executionDirectory(hardwarePrefix[productFamily]); + std::string executionDirectory(""); + if (testMode != TestMode::AubTests) { + executionDirectory += "level_zero/"; + } + executionDirectory += hardwarePrefix[productFamily]; executionDirectory += NEO::executionDirectorySuffix; //_aub for aub_tests, empty otherwise executionDirectory += "/"; executionDirectory += std::to_string(revId); diff --git a/opencl/test/unit_test/CMakeLists.txt b/opencl/test/unit_test/CMakeLists.txt index a9a3341aa5..4ef88be614 100644 --- a/opencl/test/unit_test/CMakeLists.txt +++ b/opencl/test/unit_test/CMakeLists.txt @@ -108,7 +108,7 @@ target_link_libraries(igdrcl_tests gmock-gtest ${NEO_EXTRA_LIBS}) set(BUILT_IN_KERNEL_DIR "${NEO_SOURCE_DIR}/shared/source/built_ins") function(neo_copy_test_files target product) - set(outputdir "${TargetDir}/${product}") + set(outputdir "${TargetDir}/opencl/${product}") add_custom_target(${target}) add_custom_command( TARGET ${target} @@ -123,7 +123,7 @@ function(neo_copy_test_files target product) endfunction() function(neo_copy_test_files_with_revision target product revision_id) - set(outputdir "${TargetDir}/${product}/${revision_id}") + set(outputdir "${TargetDir}/opencl/${product}/${revision_id}") add_custom_target(${target}) add_custom_command( TARGET ${target} diff --git a/opencl/test/unit_test/main.cpp b/opencl/test/unit_test/main.cpp index 76ffd70938..c6d473db40 100644 --- a/opencl/test/unit_test/main.cpp +++ b/opencl/test/unit_test/main.cpp @@ -340,7 +340,11 @@ int main(int argc, char **argv) { nClFiles.append("/"); clFiles = nClFiles; - std::string executionDirectory(hardwarePrefix[productFamily]); + std::string executionDirectory(""); + if (testMode != TestMode::AubTests) { + executionDirectory += "opencl/"; + } + executionDirectory += hardwarePrefix[productFamily]; executionDirectory += NEO::executionDirectorySuffix; // _aub for aub_tests, empty otherwise executionDirectory += "/"; executionDirectory += std::to_string(revId); diff --git a/shared/test/unit_test/main.cpp b/shared/test/unit_test/main.cpp index 4f801676c7..578ec1879b 100644 --- a/shared/test/unit_test/main.cpp +++ b/shared/test/unit_test/main.cpp @@ -325,7 +325,8 @@ int main(int argc, char **argv) { nClFiles.append("/"); clFiles = nClFiles; - std::string executionDirectory(hardwarePrefix[productFamily]); + std::string executionDirectory("shared/"); + executionDirectory += hardwarePrefix[productFamily]; executionDirectory += NEO::executionDirectorySuffix; // _aub for aub_tests, empty otherwise executionDirectory += "/"; executionDirectory += std::to_string(revId);