Merge pull request #1232 from jan-cerny/fix_sce_list

Fix SCE

Author: matejak

CMakeLists.txt

@@ -192,8 +192,11 @@ find_program(SED_EXECUTABLE sed)
 find_program(GIT_EXECUTABLE git)
 
 # ---------- CORE FEATURE SWITCHES
-
-option(ENABLE_SCE "enables Script Check Engine - an alternative checking engine that lets you use executables instead of OVAL for checks" FALSE)
+if(WIN32 OR APPLE)
+	option(ENABLE_SCE "enables Script Check Engine - an alternative checking engine that lets you use executables instead of OVAL for checks" OFF)
+else()
+	option(ENABLE_SCE "enables Script Check Engine - an alternative checking engine that lets you use executables instead of OVAL for checks" ON)
+endif()
 
 # ---------- OVAL FEATURE SWITCHES
 

src/SCE/CMakeLists.txt

@@ -1,7 +1,12 @@
 file(GLOB_RECURSE SCE_SOURCES "*.c")
 file(GLOB_RECURSE SCE_PUBLIC_HEADERS "public/*.h")
 
-add_library(openscap_sce SHARED ${SCE_SOURCES})
+add_library(openscap_sce SHARED
+	${SCE_SOURCES}
+	"${CMAKE_SOURCE_DIR}/src/common/list.c"
+	"${CMAKE_SOURCE_DIR}/src/common/oscap_string.c"
+	"${CMAKE_SOURCE_DIR}/src/common/oscap_buffer.c"
+)
 target_include_directories(openscap_sce PUBLIC public)
 set_target_properties(openscap_sce PROPERTIES VERSION ${SONAME} SOVERSION ${SOVERSION})
 target_link_libraries(openscap_sce PRIVATE openscap)

tests/sce/CMakeLists.txt

@@ -1,5 +1,7 @@
 if(ENABLE_SCE)
-	add_oscap_test("test_sce.sh")
+	if(${PYTHON_VERSION_MAJOR} EQUAL "3")
+		add_oscap_test("test_sce.sh")
+	endif()
 	add_oscap_test("test_passing_vars.sh")
 	add_oscap_test("test_check_engine_results.sh")
 	add_oscap_test("test_sce_parse_errors.sh")

tests/sce/test_sce.sh

@@ -8,6 +8,7 @@
 set -e -o pipefail
 
 function test_sce {
+    require "python3" || return 255
 
     local ret_val=0;
     local DEFFILE=${srcdir}/$1