From 7f906d9f39375fca332e51ab3b0e66884c16bf0f Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Mon, 12 Dec 2022 11:23:20 -0600 Subject: [PATCH] Move to using PYTHON_VERSION_MAJOR Closes #9948 --- tests/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d2df5cc83d8..2391ab5b143 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -181,7 +181,7 @@ endif() file(GLOB RHEL8_DISA_STIG_REF "${SSG_SHARED_REFS}/disa-stig-rhel8-v[0-9]*r[0-9]*-xccdf-manual.xml") -if (PYTHON3_EXECUTABLE) +if (PYTHON_VERSION_MAJOR GREATER 2) add_test( NAME "test-compare_ds" COMMAND env "PYTHONPATH=$ENV{PYTHONPATH}" "${PYTHON_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/utils/compare_ds.py" "${CMAKE_SOURCE_DIR}/tests/data/utils/disa-stig-rhel8-v1r6-xccdf-manual.xml" "${RHEL8_DISA_STIG_REF}" @@ -189,7 +189,7 @@ add_test( set_tests_properties("test-compare_ds" PROPERTIES LABELS quick) endif() -if (PYTHON3_EXECUTABLE AND GIT_EXECUTABLE) +if (PYTHON_VERSION_MAJOR GREATER 2 AND GIT_EXECUTABLE) add_test( NAME "test-generate_contributors" COMMAND env "PYTHONPATH=$ENV{PYTHONPATH}" "${PYTHON_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/utils/generate_contributors.py" "--dry-run" @@ -198,7 +198,7 @@ set_tests_properties("test-generate_contributors" PROPERTIES LABELS quick) endif() -if (SSG_PRODUCT_RHEL8 AND PYTHON3_EXECUTABLE) +if (PYTHON_VERSION_MAJOR GREATER 2 AND SSG_PRODUCT_RHEL8) add_test( NAME "test-create_scap_delta_tailoring" COMMAND env "PYTHONPATH=$ENV{PYTHONPATH}" "${PYTHON_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/utils/create_scap_delta_tailoring.py" --dry-run --root "${CMAKE_SOURCE_DIR}" --json "${CMAKE_BINARY_DIR}/rule_dirs.json" --build-config-yaml "${CMAKE_BINARY_DIR}/build_config.yml" --reference "stigid" --output "${CMAKE_BINARY_DIR}/rhel8_stig_tailoring.xml" --product rhel8 --manual "${RHEL8_DISA_STIG_REF}" -B "${CMAKE_BINARY_DIR}" @@ -216,7 +216,7 @@ set_tests_properties("test-create_scap_delta_tailoring_resolved" PROPERTIES DEPE endif() -if (PYTHON3_EXECUTABLE AND PYTHON_VERSION_MINOR GREATER 6) +if (PYTHON_VERSION_MAJOR GREATER 2 AND PYTHON_VERSION_MINOR GREATER 6) add_test( NAME "test-controleval-directory" COMMAND env "PYTHONPATH=$ENV{PYTHONPATH}" "${PYTHON_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/utils/controleval.py" "--controls-dir" "${CMAKE_SOURCE_DIR}/tests/unit/ssg-module/data/controls_dir" "stats" "--level" "high" "--product" "rhel9" "--id" "qrst-levels" @@ -246,7 +246,7 @@ macro(ssg_refcheck_test PRODUCT PROFILE KEY) set_tests_properties("refchecker-${PRODUCT}-${PROFILE}" PROPERTIES LABELS quick) endmacro() -if (PYTHON3_EXECUTABLE AND SSG_PRODUCT_RHEL8) +if (PYTHON_VERSION_MAJOR GREATER 2 AND SSG_PRODUCT_RHEL8) ssg_refcheck_test("rhel8" "cis_workstation_l1" "cis") ssg_refcheck_test("rhel8" "cis_workstation_l2" "cis") ssg_refcheck_test("rhel8" "cis_server_l1" "cis") @@ -254,7 +254,7 @@ if (PYTHON3_EXECUTABLE AND SSG_PRODUCT_RHEL8) endif() -if (PYTHON3_EXECUTABLE AND SSG_PRODUCT_RHEL7) +if (PYTHON_VERSION_MAJOR GREATER 2 AND SSG_PRODUCT_RHEL7) ssg_refcheck_test("rhel7" "cis_workstation_l1" "cis") ssg_refcheck_test("rhel7" "cis_workstation_l2" "cis") ssg_refcheck_test("rhel7" "cis_server_l1" "cis")