From ea373d2664251b10e55aa237555e4ba9221ace0f Mon Sep 17 00:00:00 2001 From: Artur Harasimiuk Date: Wed, 10 Nov 2021 10:34:06 +0000 Subject: [PATCH] cmake: cleanup variable names Signed-off-by: Artur Harasimiuk --- BUILD.md | 2 +- CMakeLists.txt | 23 +++++++++++-------- cmake/run_aub_test_target.cmake | 8 +++---- cmake/run_ult_target.cmake | 4 ++-- level_zero/CMakeLists.txt | 17 +++++++------- level_zero/tools/test/CMakeLists.txt | 4 ++-- manifests/manifest.yml | 2 +- platforms.cmake | 6 ++--- .../docker/Dockerfile-ubuntu-18.04-clang-8-l0 | 2 +- .../Dockerfile-ubuntu-18.04-gcc-gen-11-l0 | 2 +- .../Dockerfile-ubuntu-18.04-gcc-gen-12-l0 | 2 +- .../Dockerfile-ubuntu-18.04-gcc-gen-9-l0 | 2 +- .../docker/Dockerfile-ubuntu-20.04-clang-l0 | 2 +- .../Dockerfile-ubuntu-20.04-gcc-gen-11-l0 | 2 +- .../Dockerfile-ubuntu-20.04-gcc-gen-12-l0 | 2 +- .../Dockerfile-ubuntu-20.04-gcc-gen-9-l0 | 2 +- .../l0_gpu_driver/build_l0_gpu_driver_deb.sh | 6 ++--- .../rhel_8.4/SPECS/l0_gpu_driver.spec | 2 +- .../sles_15.3/SPECS/l0_gpu_driver.spec | 2 +- .../l0_gpu_driver/ubuntu_20.04/debian/rules | 2 +- scripts/packaging/opencl/build_opencl_deb.sh | 8 +++---- .../opencl/rhel_8.4/SPECS/opencl.spec | 2 +- .../opencl/sles_15.3/SPECS/opencl.spec | 2 +- .../opencl/ubuntu_20.04/debian/rules | 2 +- shared/source/CMakeLists.txt | 2 +- shared/test/unit_test/CMakeLists.txt | 4 ++-- 26 files changed, 59 insertions(+), 55 deletions(-) diff --git a/BUILD.md b/BUILD.md index 7af8ca99a9..61709cd2cf 100644 --- a/BUILD.md +++ b/BUILD.md @@ -68,7 +68,7 @@ Example: ```shell cd build -cmake -DCMAKE_BUILD_TYPE=Release -DSKIP_UNIT_TESTS=1 ../neo +cmake -DCMAKE_BUILD_TYPE=Release -DNEO_SKIP_UNIT_TESTS=1 ../neo make -j`nproc` sudo make install ``` diff --git a/CMakeLists.txt b/CMakeLists.txt index b5ede5fd0a..811560d642 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -222,11 +222,16 @@ if(NOT DEFINED NEO_SHARED_TEST_DIRECTORY) set(NEO_SHARED_TEST_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/shared/test) endif() -if(SKIP_UNIT_TESTS) - set(SKIP_NEO_UNIT_TESTS TRUE) - set(SKIP_SHARED_UNIT_TESTS TRUE) - set(SKIP_L0_UNIT_TESTS TRUE) - set(SKIP_L0_BLACK_BOX_TESTS TRUE) +# leave temporarily for compatibitlity +if(DEFINED SKIP_UNIT_TESTS) + set(NEO_SKIP_UNIT_TESTS ${SKIP_UNIT_TESTS}) +endif() + +if(NEO_SKIP_UNIT_TESTS) + set(NEO_SKIP_SHARED_UNIT_TESTS TRUE) + set(NEO_SKIP_OCL_UNIT_TESTS TRUE) + set(NEO_SKIP_L0_UNIT_TESTS TRUE) + set(NEO_SKIP_L0_BLACK_BOX_TESTS TRUE) endif() # Set our build directory @@ -277,7 +282,7 @@ else() add_definitions(-DPURGE_DEBUG_KEY_NAMES=0) endif() -if(NOT SKIP_UNIT_TESTS) +if(NOT NEO_SKIP_UNIT_TESTS) if(NOT DEFINED GTEST_REPEAT) set(GTEST_REPEAT 1) endif() @@ -753,7 +758,7 @@ if(DONT_CARE_OF_VIRTUALS) set(NEO_SHARED_MOCKABLE_LIB_NAME ${NEO_SHARED_RELEASE_LIB_NAME}) else() set(NEO_SHARED_RELEASE_LIB_NAME "neo_shared") - if(NOT SKIP_UNIT_TESTS) + if(NOT NEO_SKIP_UNIT_TESTS) set(NEO_SHARED_MOCKABLE_LIB_NAME "neo_shared_mockable") endif() endif() @@ -821,13 +826,13 @@ if(DONT_CARE_OF_VIRTUALS) else() set(NEO_RELEASE_LIB_NAME "igdrcl_lib_release") # Used by dll/so generate_runtime_lib(${NEO_RELEASE_LIB_NAME} FALSE TRUE) - if(NOT SKIP_UNIT_TESTS) + if(NOT NEO_SKIP_UNIT_TESTS) set(NEO_MOCKABLE_LIB_NAME "igdrcl_lib_mockable") # Used by ULTS generate_runtime_lib(${NEO_MOCKABLE_LIB_NAME} TRUE FALSE) endif() endif() -if(DEFAULT_TESTED_PLATFORM AND NOT SKIP_NEO_UNIT_TESTS) +if(DEFAULT_TESTED_PLATFORM AND NOT NEO_SKIP_OCL_UNIT_TESTS) add_subdirectory_unique(${NEO_RUNTIME_TESTS_SUB_DIR} ${NEO_BUILD_DIR}/${NEO_RUNTIME_TESTS_SUB_DIR}) else() hide_subdir(${NEO_RUNTIME_TESTS_SUB_DIR}) diff --git a/cmake/run_aub_test_target.cmake b/cmake/run_aub_test_target.cmake index 2b8f9fd3d7..7a4789f212 100644 --- a/cmake/run_aub_test_target.cmake +++ b/cmake/run_aub_test_target.cmake @@ -13,9 +13,9 @@ list(GET aub_test_config 4 revision_id) add_custom_target(run_${product}_${revision_id}_aub_tests ALL) -if(NOT SKIP_NEO_UNIT_TESTS OR NOT SKIP_L0_UNIT_TESTS) +if(NOT NEO_SKIP_OCL_UNIT_TESTS OR NOT NEO_SKIP_L0_UNIT_TESTS) - if(NOT SKIP_NEO_UNIT_TESTS) + if(NOT NEO_SKIP_OCL_UNIT_TESTS) add_dependencies(run_${product}_${revision_id}_aub_tests copy_test_files_per_product) add_dependencies(run_${product}_${revision_id}_aub_tests prepare_test_kernels_for_ocl) add_dependencies(run_${product}_${revision_id}_aub_tests prepare_test_kernels_for_shared) @@ -51,7 +51,7 @@ if(NOT SKIP_NEO_UNIT_TESTS OR NOT SKIP_L0_UNIT_TESTS) endif() -if(NOT SKIP_NEO_UNIT_TESTS) +if(NOT NEO_SKIP_OCL_UNIT_TESTS) if(WIN32 OR NOT DEFINED NEO__GMM_LIBRARY_PATH) set(aub_test_cmd_prefix $) else() @@ -67,7 +67,7 @@ if(NOT SKIP_NEO_UNIT_TESTS) ) endif() -if(NOT SKIP_L0_UNIT_TESTS AND BUILD_WITH_L0) +if(NOT NEO_SKIP_L0_UNIT_TESTS AND BUILD_WITH_L0) add_dependencies(run_${product}_${revision_id}_aub_tests prepare_test_kernels_for_l0) if(WIN32 OR NOT DEFINED NEO__GMM_LIBRARY_PATH) diff --git a/cmake/run_ult_target.cmake b/cmake/run_ult_target.cmake index 88086d934e..cd093e9a43 100644 --- a/cmake/run_ult_target.cmake +++ b/cmake/run_ult_target.cmake @@ -13,7 +13,7 @@ list(GET unit_test_config 4 revision_id) add_custom_target(run_${product}_${revision_id}_unit_tests ALL DEPENDS unit_tests) set_target_properties(run_${product}_${revision_id}_unit_tests PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}/${revision_id}") -if(NOT SKIP_NEO_UNIT_TESTS) +if(NOT NEO_SKIP_OCL_UNIT_TESTS) add_custom_command( TARGET run_${product}_${revision_id}_unit_tests POST_BUILD @@ -42,7 +42,7 @@ if(NOT SKIP_NEO_UNIT_TESTS) endif() endif() -if(NOT SKIP_L0_UNIT_TESTS AND BUILD_WITH_L0) +if(NOT NEO_SKIP_L0_UNIT_TESTS AND BUILD_WITH_L0) add_custom_command( TARGET run_${product}_${revision_id}_unit_tests POST_BUILD diff --git a/level_zero/CMakeLists.txt b/level_zero/CMakeLists.txt index 0046a5241d..cc607b6e09 100644 --- a/level_zero/CMakeLists.txt +++ b/level_zero/CMakeLists.txt @@ -340,12 +340,11 @@ if(BUILD_WITH_L0) add_subdirectory_unique(api) add_subdirectory_unique(source) - if(DONT_CARE_OF_VIRTUALS) - set(L0_RELEASE_LIB_NAME "${TARGET_NAME_L0}_lib") - set(L0_MOCKABLE_LIB_NAME "${TARGET_NAME_L0}_lib") - else() - set(L0_RELEASE_LIB_NAME "${TARGET_NAME_L0}_lib") - if(NOT SKIP_UNIT_TESTS) + set(L0_RELEASE_LIB_NAME "${TARGET_NAME_L0}_lib") + if(NOT NEO_SKIP_L0_UNIT_TESTS) + if(DONT_CARE_OF_VIRTUALS) + set(L0_MOCKABLE_LIB_NAME "${TARGET_NAME_L0}_lib") + else() set(L0_MOCKABLE_LIB_NAME "${TARGET_NAME_L0}_mockable") endif() endif() @@ -455,7 +454,7 @@ if(BUILD_WITH_L0) generate_l0_lib(${L0_RELEASE_LIB_NAME} TRUE) else() generate_l0_lib(${L0_RELEASE_LIB_NAME} FALSE) - if(NOT SKIP_UNIT_TESTS) + if(NOT NEO_SKIP_L0_UNIT_TESTS) generate_l0_lib(${L0_MOCKABLE_LIB_NAME} TRUE) endif() endif() @@ -522,7 +521,7 @@ if(BUILD_WITH_L0) CONFIGURATIONS Debug ) endif() - if(NOT SKIP_L0_UNIT_TESTS) + if(NOT NEO_SKIP_L0_UNIT_TESTS) add_subdirectory_unique(core/test/common) add_subdirectory_unique(core/test/unit_tests) add_subdirectory_unique(core/test/aub_tests) @@ -535,7 +534,7 @@ if(BUILD_WITH_L0) hide_subdir(tools/test/unit_tests) hide_subdir(experimental/test/unit_tests) endif() - if(NOT SKIP_L0_BLACK_BOX_TESTS) + if(NOT NEO_SKIP_L0_BLACK_BOX_TESTS) add_subdirectory_unique(core/test/black_box_tests) add_subdirectory_unique(tools/test/black_box_tests) else() diff --git a/level_zero/tools/test/CMakeLists.txt b/level_zero/tools/test/CMakeLists.txt index c2cabad1f4..00f0f5da50 100644 --- a/level_zero/tools/test/CMakeLists.txt +++ b/level_zero/tools/test/CMakeLists.txt @@ -4,10 +4,10 @@ # SPDX-License-Identifier: MIT # -if(NOT SKIP_L0_UNIT_TESTS) +if(NOT NEO_SKIP_L0_UNIT_TESTS) add_subdirectory(unit_tests) endif() -if(NOT SKIP_L0_BLACK_BOX_TESTS) +if(NOT NEO_SKIP_L0_BLACK_BOX_TESTS) add_subdirectory(black_box_tests) endif() diff --git a/manifests/manifest.yml b/manifests/manifest.yml index a8c1f40467..ce57a866ed 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -20,7 +20,7 @@ components: infra: branch: master dest_dir: infra - revision: 2c43f8999269ed8eafceac57c7876467c07524e6 + revision: f6a8bed6105836a5a2d8ddd20b7a4a57edf09776 type: git internal: branch: master diff --git a/platforms.cmake b/platforms.cmake index 571795a868..eeb8e76592 100644 --- a/platforms.cmake +++ b/platforms.cmake @@ -160,7 +160,7 @@ macro(SET_FLAGS_FOR GEN_TYPE) set(TESTS_${GEN_TYPE} ${SUPPORT_${GEN_TYPE}} CACHE BOOL "Build ULTs for ${GEN_TYPE} devices") set(SUPPORT_DEVICE_ENQUEUE_${GEN_TYPE} TRUE CACHE BOOL "Support ${GEN_TYPE} for device side enqueue") - if(NOT SUPPORT_${GEN_TYPE} OR SKIP_UNIT_TESTS) + if(NOT SUPPORT_${GEN_TYPE} OR NEO_SKIP_UNIT_TESTS) set(TESTS_${GEN_TYPE} FALSE) endif() @@ -173,7 +173,7 @@ macro(SET_FLAGS_FOR GEN_TYPE) if(TESTS_${GEN_TYPE}) set(TESTS_${${GEN_TYPE}_PLATFORM} ${SUPPORT_${${GEN_TYPE}_PLATFORM}} CACHE BOOL "Build ULTs for ${${GEN_TYPE}_PLATFORM}") endif() - if(NOT SUPPORT_${${GEN_TYPE}_PLATFORM} OR NOT TESTS_${GEN_TYPE} OR SKIP_UNIT_TESTS) + if(NOT SUPPORT_${${GEN_TYPE}_PLATFORM} OR NOT TESTS_${GEN_TYPE} OR NEO_SKIP_UNIT_TESTS) set(TESTS_${${GEN_TYPE}_PLATFORM} FALSE) endif() endforeach() @@ -235,7 +235,7 @@ if(DEFAULT_TESTED_PLATFORM) message(FATAL_ERROR "Not a valid tested platform: ${DEFAULT_TESTED_PLATFORM}") endif() else() - set(SKIP_UNIT_TESTS TRUE) + set(NEO_SKIP_UNIT_TESTS TRUE) endif() if(NOT DEFAULT_TESTED_FAMILY_NAME) diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-clang-8-l0 b/scripts/docker/Dockerfile-ubuntu-18.04-clang-8-l0 index 6911306d09..4e195fe667 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-clang-8-l0 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-clang-8-l0 @@ -9,7 +9,7 @@ RUN apt-get -y update ; apt-get --no-install-recommends install -y --allow-unaut apt-get -y update ; apt-get --no-install-recommends install -y \ --allow-unauthenticated cmake make pkg-config libigc-dev intel-gmmlib-dev clang-8 libze-loader-dev RUN mkdir /root/build; cd /root/build ; cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DSKIP_NEO_UNIT_TESTS=TRUE \ + -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DNEO_SKIP_OCL_UNIT_TESTS=TRUE \ -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 -DBUILD_WITH_L0=1 ../neo ; \ make -j `nproc` ze_intel_gpu run_unit_tests CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-gen-11-l0 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-gen-11-l0 index f64310cf3d..20a731984d 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-gen-11-l0 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-gen-11-l0 @@ -8,7 +8,7 @@ RUN apt-get -y update ; apt-get --no-install-recommends install -y --allow-unaut apt-get -y update ; apt-get --no-install-recommends install -y --allow-unauthenticated \ cmake make g++ pkg-config libigc-dev intel-gmmlib-dev libze-loader-dev RUN mkdir /root/build; cd /root/build ; cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DSKIP_NEO_UNIT_TESTS=TRUE \ + -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DNEO_SKIP_OCL_UNIT_TESTS=TRUE \ -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=1 -DSUPPORT_GEN12LP=0 \ -DBUILD_WITH_L0=1 ../neo; \ make -j `nproc` ze_intel_gpu run_unit_tests diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-gen-12-l0 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-gen-12-l0 index cdffcab26d..93af44c4d8 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-gen-12-l0 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-gen-12-l0 @@ -8,7 +8,7 @@ RUN apt-get -y update ; apt-get --no-install-recommends install -y --allow-unaut apt-get -y update ; apt-get --no-install-recommends install -y --allow-unauthenticated \ cmake make g++ pkg-config libigc-dev intel-gmmlib-dev libze-loader-dev RUN mkdir /root/build; cd /root/build ; cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DSKIP_NEO_UNIT_TESTS=TRUE \ + -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DNEO_SKIP_OCL_UNIT_TESTS=TRUE \ -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=1 \ -DBUILD_WITH_L0=1 ../neo; \ make -j `nproc` ze_intel_gpu run_unit_tests diff --git a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-gen-9-l0 b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-gen-9-l0 index 4bf9780811..ae4d63aade 100644 --- a/scripts/docker/Dockerfile-ubuntu-18.04-gcc-gen-9-l0 +++ b/scripts/docker/Dockerfile-ubuntu-18.04-gcc-gen-9-l0 @@ -8,7 +8,7 @@ RUN apt-get -y update ; apt-get --no-install-recommends install -y --allow-unaut apt-get -y update ; apt-get --no-install-recommends install -y --allow-unauthenticated \ cmake make g++ pkg-config libigc-dev intel-gmmlib-dev libze-loader-dev RUN mkdir /root/build; cd /root/build ; cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DSKIP_NEO_UNIT_TESTS=TRUE \ + -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DNEO_SKIP_OCL_UNIT_TESTS=TRUE \ -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=1 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=0 \ -DBUILD_WITH_L0=1 ../neo; \ make -j `nproc` ze_intel_gpu run_unit_tests diff --git a/scripts/docker/Dockerfile-ubuntu-20.04-clang-l0 b/scripts/docker/Dockerfile-ubuntu-20.04-clang-l0 index 546efb4efb..2372737960 100644 --- a/scripts/docker/Dockerfile-ubuntu-20.04-clang-l0 +++ b/scripts/docker/Dockerfile-ubuntu-20.04-clang-l0 @@ -9,7 +9,7 @@ RUN apt-get -y update ; apt-get --no-install-recommends install -y --allow-unaut apt-get -y update ; DEBIAN_FRONTEND="noninteractive" apt-get --no-install-recommends install -y \ --allow-unauthenticated cmake make pkg-config libigc-dev intel-gmmlib-dev clang libstdc++-10-dev libze-loader-dev RUN mkdir /root/build; cd /root/build ; cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DSKIP_NEO_UNIT_TESTS=TRUE \ + -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DNEO_SKIP_OCL_UNIT_TESTS=TRUE \ -DDO_NOT_RUN_AUB_TESTS=1 -DDONT_CARE_OF_VIRTUALS=1 -DBUILD_WITH_L0=1 ../neo ; \ make -j `nproc` ze_intel_gpu run_unit_tests CMD ["/bin/bash"] diff --git a/scripts/docker/Dockerfile-ubuntu-20.04-gcc-gen-11-l0 b/scripts/docker/Dockerfile-ubuntu-20.04-gcc-gen-11-l0 index ce49cda6d4..5578bf342d 100644 --- a/scripts/docker/Dockerfile-ubuntu-20.04-gcc-gen-11-l0 +++ b/scripts/docker/Dockerfile-ubuntu-20.04-gcc-gen-11-l0 @@ -8,7 +8,7 @@ RUN apt-get -y update ; apt-get --no-install-recommends install -y --allow-unaut apt-get -y update ; DEBIAN_FRONTEND="noninteractive" apt-get --no-install-recommends install -y --allow-unauthenticated \ cmake make g++ pkg-config libigc-dev intel-gmmlib-dev libze-loader-dev RUN mkdir /root/build; cd /root/build ; cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DSKIP_NEO_UNIT_TESTS=TRUE \ + -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DNEO_SKIP_OCL_UNIT_TESTS=TRUE \ -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=1 -DSUPPORT_GEN12LP=0 \ -DBUILD_WITH_L0=1 ../neo; \ make -j `nproc` ze_intel_gpu run_unit_tests diff --git a/scripts/docker/Dockerfile-ubuntu-20.04-gcc-gen-12-l0 b/scripts/docker/Dockerfile-ubuntu-20.04-gcc-gen-12-l0 index ff2764dcc7..268a3f1b83 100644 --- a/scripts/docker/Dockerfile-ubuntu-20.04-gcc-gen-12-l0 +++ b/scripts/docker/Dockerfile-ubuntu-20.04-gcc-gen-12-l0 @@ -8,7 +8,7 @@ RUN apt-get -y update ; apt-get --no-install-recommends install -y --allow-unaut apt-get -y update ; DEBIAN_FRONTEND="noninteractive" apt-get --no-install-recommends install -y --allow-unauthenticated \ cmake make g++ pkg-config libigc-dev intel-gmmlib-dev libze-loader-dev RUN mkdir /root/build; cd /root/build ; cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DSKIP_NEO_UNIT_TESTS=TRUE \ + -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DNEO_SKIP_OCL_UNIT_TESTS=TRUE \ -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=0 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=1 \ -DBUILD_WITH_L0=1 ../neo; \ make -j `nproc` ze_intel_gpu run_unit_tests diff --git a/scripts/docker/Dockerfile-ubuntu-20.04-gcc-gen-9-l0 b/scripts/docker/Dockerfile-ubuntu-20.04-gcc-gen-9-l0 index de7768403d..1da3f26b60 100644 --- a/scripts/docker/Dockerfile-ubuntu-20.04-gcc-gen-9-l0 +++ b/scripts/docker/Dockerfile-ubuntu-20.04-gcc-gen-9-l0 @@ -8,7 +8,7 @@ RUN apt-get -y update ; apt-get --no-install-recommends install -y --allow-unaut apt-get -y update ; DEBIAN_FRONTEND="noninteractive" apt-get --no-install-recommends install -y --allow-unauthenticated \ cmake make g++ pkg-config libigc-dev intel-gmmlib-dev libze-loader-dev RUN mkdir /root/build; cd /root/build ; cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DSKIP_NEO_UNIT_TESTS=TRUE \ + -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DNEO_SKIP_OCL_UNIT_TESTS=TRUE \ -DSUPPORT_GEN8=0 -DSUPPORT_GEN9=1 -DSUPPORT_GEN11=0 -DSUPPORT_GEN12LP=0 \ -DBUILD_WITH_L0=1 ../neo; \ make -j `nproc` ze_intel_gpu run_unit_tests diff --git a/scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_deb.sh b/scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_deb.sh index cda0eef5b6..e7815cd3df 100755 --- a/scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_deb.sh +++ b/scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_deb.sh @@ -12,7 +12,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" REPO_DIR="$( cd "$( dirname "${DIR}/../../../../" )" && pwd )" BUILD_DIR="${REPO_DIR}/../build_l0_gpu_driver" -SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-FALSE} +NEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS:-FALSE} BRANCH_SUFFIX="$( cat ${REPO_DIR}/.branch )" @@ -130,9 +130,9 @@ EOF export DH_INTERNAL_BUILDFLAGS=1 fi if [ "${ENABLE_ULT}" == "0" ]; then - SKIP_UNIT_TESTS="TRUE" + NEO_SKIP_UNIT_TESTS="TRUE" fi - export SKIP_UNIT_TESTS + export NEO_SKIP_UNIT_TESTS dch -v ${PKG_VERSION} -m "build $PKG_VERSION" dpkg-buildpackage -j`nproc --all` -us -uc -b -rfakeroot diff --git a/scripts/packaging/l0_gpu_driver/rhel_8.4/SPECS/l0_gpu_driver.spec b/scripts/packaging/l0_gpu_driver/rhel_8.4/SPECS/l0_gpu_driver.spec index 052d74005e..dbf545ffb3 100644 --- a/scripts/packaging/l0_gpu_driver/rhel_8.4/SPECS/l0_gpu_driver.spec +++ b/scripts/packaging/l0_gpu_driver/rhel_8.4/SPECS/l0_gpu_driver.spec @@ -43,7 +43,7 @@ cd build %cmake .. \ -DNEO_VERSION_BUILD=%{build_id} \ -DCMAKE_BUILD_TYPE=Release \ - -DSKIP_UNIT_TESTS=1 \ + -DNEO_SKIP_UNIT_TESTS=1 \ -DCMAKE_INSTALL_PREFIX=/usr \ -DL0_INSTALL_UDEV_RULES=1 \ -DUDEV_RULES_DIR=/etc/udev/rules.d/ diff --git a/scripts/packaging/l0_gpu_driver/sles_15.3/SPECS/l0_gpu_driver.spec b/scripts/packaging/l0_gpu_driver/sles_15.3/SPECS/l0_gpu_driver.spec index 97efc72ab6..d7714b76e7 100644 --- a/scripts/packaging/l0_gpu_driver/sles_15.3/SPECS/l0_gpu_driver.spec +++ b/scripts/packaging/l0_gpu_driver/sles_15.3/SPECS/l0_gpu_driver.spec @@ -54,7 +54,7 @@ exposing hardware capabilities to applications. -DNEO_VERSION_BUILD=%{build_id} \ -DCMAKE_BUILD_TYPE=%{build_type} \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DSKIP_UNIT_TESTS=TRUE \ + -DNEO_SKIP_UNIT_TESTS=TRUE \ -DRELEASE_WITH_REGKEYS=TRUE \ -DL0_INSTALL_UDEV_RULES=1 \ -DUDEV_RULES_DIR=/etc/udev/rules.d/ \ diff --git a/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules b/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules index b649290d50..cdcc51f9df 100755 --- a/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules +++ b/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules @@ -11,7 +11,7 @@ override_dh_auto_configure: dh_auto_configure -- ${NEO_BUILD_EXTRA_OPTS} \ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ -DNEO_VERSION_BUILD=$(ver) \ - -DSKIP_UNIT_TESTS=${SKIP_UNIT_TESTS} \ + -DNEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS} \ -DRELEASE_WITH_REGKEYS=${RELEASE_WITH_REGKEYS} \ -DIGDRCL_FORCE_USE_LIBVA=${IGDRCL_FORCE_USE_LIBVA} \ -DL0_INSTALL_UDEV_RULES=1 \ diff --git a/scripts/packaging/opencl/build_opencl_deb.sh b/scripts/packaging/opencl/build_opencl_deb.sh index f697bb43d8..abec44bda5 100755 --- a/scripts/packaging/opencl/build_opencl_deb.sh +++ b/scripts/packaging/opencl/build_opencl_deb.sh @@ -12,7 +12,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" REPO_DIR="$( cd "$( dirname "${DIR}/../../../../" )" && pwd )" BUILD_DIR="${REPO_DIR}/../build_opencl" -SKIP_UNIT_TESTS=${SKIP_UNIT_TESTS:-FALSE} +NEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS:-FALSE} BRANCH_SUFFIX="$( cat ${REPO_DIR}/.branch )" @@ -103,15 +103,15 @@ EOF export DH_INTERNAL_BUILDFLAGS=1 fi if [ "${ENABLE_ULT}" == "0" ]; then - SKIP_UNIT_TESTS="TRUE" + NEO_SKIP_UNIT_TESTS="TRUE" fi if [ "${TARGET_ARCH}" == "aarch64" ]; then - SKIP_UNIT_TESTS="TRUE" + NEO_SKIP_UNIT_TESTS="TRUE" export NEO_DISABLE_BUILTINS_COMPILATION="TRUE" fi - export SKIP_UNIT_TESTS + export NEO_SKIP_UNIT_TESTS dch -v ${PKG_VERSION} -m "build $PKG_VERSION" -b dpkg-buildpackage -j`nproc --all` -us -uc -b -rfakeroot diff --git a/scripts/packaging/opencl/rhel_8.4/SPECS/opencl.spec b/scripts/packaging/opencl/rhel_8.4/SPECS/opencl.spec index 0dbe445dbd..a499947ae0 100644 --- a/scripts/packaging/opencl/rhel_8.4/SPECS/opencl.spec +++ b/scripts/packaging/opencl/rhel_8.4/SPECS/opencl.spec @@ -45,7 +45,7 @@ cd build -DNEO_VERSION_BUILD=%{ver} \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_WITH_L0=0 \ - -DSKIP_UNIT_TESTS=1 \ + -DNEO_SKIP_UNIT_TESTS=TRUE \ -DCMAKE_INSTALL_PREFIX=/usr \ -DRELEASE_WITH_REGKEYS=1 %make_build diff --git a/scripts/packaging/opencl/sles_15.3/SPECS/opencl.spec b/scripts/packaging/opencl/sles_15.3/SPECS/opencl.spec index 48d3b391c8..9f30c97041 100644 --- a/scripts/packaging/opencl/sles_15.3/SPECS/opencl.spec +++ b/scripts/packaging/opencl/sles_15.3/SPECS/opencl.spec @@ -54,7 +54,7 @@ Summary: ocloc package for opencl -DNEO_VERSION_BUILD=%{ver} \ -DBUILD_WITH_L0=0 \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DSKIP_UNIT_TESTS=1 \ + -DNEO_SKIP_UNIT_TESTS=TRUE \ -DRELEASE_WITH_REGKEYS=1 \ -Wno-dev %make_build diff --git a/scripts/packaging/opencl/ubuntu_20.04/debian/rules b/scripts/packaging/opencl/ubuntu_20.04/debian/rules index b78139d2ad..73b849c0ca 100755 --- a/scripts/packaging/opencl/ubuntu_20.04/debian/rules +++ b/scripts/packaging/opencl/ubuntu_20.04/debian/rules @@ -14,7 +14,7 @@ override_dh_auto_configure: -DNEO_OCL_VERSION_MINOR=${NEO_OCL_VERSION_MINOR} \ -DNEO_VERSION_BUILD=${NEO_OCL_VERSION_BUILD} \ -DDO_NOT_RUN_AUB_TESTS=${DO_NOT_RUN_AUB_TESTS} \ - -DSKIP_UNIT_TESTS=${SKIP_UNIT_TESTS} \ + -DNEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS} \ -DNEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION} \ -DBUILD_WITH_L0=0 \ -DRELEASE_WITH_REGKEYS=${RELEASE_WITH_REGKEYS} \ diff --git a/shared/source/CMakeLists.txt b/shared/source/CMakeLists.txt index 269ce0a34f..ce3f3488e3 100644 --- a/shared/source/CMakeLists.txt +++ b/shared/source/CMakeLists.txt @@ -188,7 +188,7 @@ if(DONT_CARE_OF_VIRTUALS) generate_shared_lib(${NEO_SHARED_RELEASE_LIB_NAME} TRUE) else() generate_shared_lib(${NEO_SHARED_RELEASE_LIB_NAME} FALSE) - if(NOT SKIP_UNIT_TESTS) + if(NOT NEO_SKIP_UNIT_TESTS) generate_shared_lib(${NEO_SHARED_MOCKABLE_LIB_NAME} TRUE) endif() endif() diff --git a/shared/test/unit_test/CMakeLists.txt b/shared/test/unit_test/CMakeLists.txt index c4aedb0105..9a4637303d 100644 --- a/shared/test/unit_test/CMakeLists.txt +++ b/shared/test/unit_test/CMakeLists.txt @@ -5,7 +5,7 @@ # set(SHARED_TEST_PROJECTS_FOLDER "neo shared") -if(NOT SKIP_UNIT_TESTS) +if(NOT NEO_SKIP_UNIT_TESTS) add_custom_target(unit_tests) @@ -67,7 +67,7 @@ if(NOT SKIP_UNIT_TESTS) add_subdirectory(${NEO_SHARED_TEST_DIRECTORY}/common "${NEO_BUILD_DIR}/shared/test/common") add_subdirectory_unique(mocks) - if(NOT SKIP_SHARED_UNIT_TESTS) + if(NOT NEO_SKIP_SHARED_UNIT_TESTS) add_subdirectories() endif()