Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: create working dir for tests 

Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
This commit is contained in:
Artur Harasimiuk 2022-05-20 17:24:17 +00:00 committed by Compute-Runtime-Automation
parent 13f8139951
commit 8f5467d3c6
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/run_ult_target.cmake
View File

@ -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: $<TARGET_FILE:neo_shared_tests> --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} $<TARGET_FILE:neo_shared_tests> --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} $<TARGET_FILE:ze_intel_gpu_core_tests> --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} $<TARGET_FILE:ze_intel_gpu_core_tests> --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}

6
level_zero/core/test/unit_tests/main.cpp
View File

@ -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);

4
opencl/test/unit_test/CMakeLists.txt
View File

@ -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}

6
opencl/test/unit_test/main.cpp
View File

@ -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);

3
shared/test/unit_test/main.cpp
View File

@ -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);