diff options
Diffstat (limited to 'testing/openscap/openscap.patch')
| -rw-r--r-- | testing/openscap/openscap.patch | 98 |
1 files changed, 0 insertions, 98 deletions
diff --git a/testing/openscap/openscap.patch b/testing/openscap/openscap.patch deleted file mode 100644 index aa70b93215..0000000000 --- a/testing/openscap/openscap.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/tests/API/XCCDF/unittests/all.sh b/tests/API/XCCDF/unittests/all.sh -index 8796cc0..8e57aa3 100755 ---- a/tests/API/XCCDF/unittests/all.sh -+++ b/tests/API/XCCDF/unittests/all.sh -@@ -98,7 +98,7 @@ test_run "XCCDF Remediate + perl fix" $srcdir/test_remediate_perl.sh - # - # Tests for XCCDF report - # --test_run 'generate report: xccdf:check/@selector=""' $srcdir/test_report_check_with_empty_selector.sh -+#test_run 'generate report: xccdf:check/@selector=""' $srcdir/test_report_check_with_empty_selector.sh - test_run "generate report: missing xsl shall not segfault" $srcdir/test_report_without_xsl_fails_gracefully.sh - test_run "generate report: avoid warnings from libxml" $srcdir/test_report_without_oval_poses_no_errors.sh - -diff --git a/tests/mitre/test_mitre_common.sh b/tests/mitre/test_mitre_common.sh -index e922444..7fbf025 100755 ---- a/tests/mitre/test_mitre_common.sh -+++ b/tests/mitre/test_mitre_common.sh -@@ -12,7 +12,7 @@ DISTRO="$(cat /etc/*-release | head -n1)" - DISTRO_NAME="$(cat /etc/*-release | awk '{print $1}' | head -n1)" - DISTRO_RELEASE="$(cat /etc/*-release | sed -n 's|^[^0-9]*\([0-9]*\).*$|\1|p' | head -n1)" - SELINUX_ENABLED=$(grep -iqE "(SELINUX=enforcing|SELINUX=permissive)" \ -- /etc/selinux/config 2>/dev/null; echo $?) -+echo "SELinux test bypassed" - - function test_mitre { - -diff --git a/tests/probes/runlevel/test_probes_runlevel.sh b/tests/probes/runlevel/test_probes_runlevel.sh -index f8dd13e..78cd148 100755 ---- a/tests/probes/runlevel/test_probes_runlevel.sh -+++ b/tests/probes/runlevel/test_probes_runlevel.sh -@@ -20,7 +20,7 @@ - - function test_probes_runlevel_A { - -- probecheck "runlevel" || return 255 -+ probecheck "runlevellllll" || return 255 - require "chkconfig" || return 255 - require "egrep" || return 255 - require "awk" || return 255 -@@ -81,7 +81,7 @@ function test_probes_runlevel_A { - - function test_probes_runlevel_B { - -- probecheck "runlevel" || return 255 -+ probecheck "runlevellllll" || return 255 - - local ret_val=0; - local DF="test_probes_runlevel_B.xml" -@@ -108,7 +108,7 @@ function test_probes_runlevel_B { - } - - function test_probes_runlevel_C { -- probecheck "runlevel" || return 255 -+ probecheck "runlevellllll" || return 255 - - local ret_val=0; - local definition="test_probes_runlevel_C.xml" -diff --git a/tests/probes/uname/test_probes_uname.xml.sh b/tests/probes/uname/test_probes_uname.xml.sh -index fe8f545..c78424c 100644 ---- a/tests/probes/uname/test_probes_uname.xml.sh -+++ b/tests/probes/uname/test_probes_uname.xml.sh -@@ -846,7 +846,7 @@ cat <<EOF - <os_name>`uname -s`</os_name> - <os_release>`uname -r`</os_release> - <os_version>`uname -v`</os_version> -- <processor_type>`uname -p`</processor_type> -+ <processor_type>`uname -m`</processor_type> - </uname_state> - - <!-- FULLY FALSE STATE --> -@@ -856,7 +856,7 @@ cat <<EOF - <os_name>X`uname -s`</os_name> - <os_release>X`uname -r`</os_release> - <os_version>X`uname -v`</os_version> -- <processor_type>X`uname -p`</processor_type> -+ <processor_type>X`uname -m`</processor_type> - </uname_state> - - <!-- MIXED STATE :-) --> -@@ -866,7 +866,7 @@ cat <<EOF - <os_name>`uname -s`</os_name> - <os_release>`uname -r`</os_release> - <os_version>`uname -v`</os_version> -- <processor_type>X`uname -p`</processor_type> -+ <processor_type>X`uname -m`</processor_type> - </uname_state> - - </states> -diff --git a/tests/API/XCCDF/CMakeLists.txt b/tests/API/XCCDF/CMakeLists.txt -index 678b1e9..efabcfa 100644 ---- a/tests/API/XCCDF/CMakeLists.txt -+++ b/tests/API/XCCDF/CMakeLists.txt -@@ -1,5 +1,4 @@ - add_subdirectory("applicability") --add_subdirectory("default_cpe") - add_subdirectory("fix") - add_subdirectory("guide") - add_subdirectory("parser") |