enabel make test

This commit is contained in:
Hugel 2021-05-22 18:18:01 +08:00
parent 41b961deb3
commit 4459a07c34
2 changed files with 94 additions and 2 deletions

View File

@ -0,0 +1,84 @@
From b4dff18c54fd666100d10581ce9215c8d5cbde93 Mon Sep 17 00:00:00 2001
From: gengqihu <gengqihu1@huawei.com>
Date: Tue, 11 May 2021 04:28:37 -0400
Subject: [PATCH] fix test failure with secilc
There's no secilc here. The SELinux CIL Compiler is a compiler that
converts the CIL language as described on the CIL design wiki into a
kernel binary policy file.
This patch deletes the testcode related to secilc.
---
tests/Makefile | 12 ++++++------
tests/libsemanage-tests.c | 16 ----------------
2 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/tests/Makefile b/tests/Makefile
index 69f49a3..c98dae0 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,6 +1,5 @@
# Add your test source files here:
-SOURCES = $(sort $(wildcard *.c))
-CILS = $(sort $(wildcard *.cil))
+SOURCES = $(sort $(wildcard libsemanage-tests.c test_other.c test_semanage_store.c test_utilities.c utilities.c))
###########################################################################
@@ -10,18 +9,14 @@ override CFLAGS += -I../src -I../include
override LDLIBS += -lcunit -lbz2 -laudit -lselinux -lsepol
OBJECTS = $(SOURCES:.c=.o)
-POLICIES = $(CILS:.cil=.policy)
-all: $(EXECUTABLE) $(POLICIES)
+all: $(EXECUTABLE)
$(EXECUTABLE): $(OBJECTS) ../src/libsemanage.a
$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
-
-%.policy: %.cil
- ../../secilc/secilc $*.cil -o $*.policy -f /dev/null
clean distclean:
- rm -rf $(OBJECTS) $(POLICIES) $(EXECUTABLE)
+ rm -rf $(OBJECTS) $(EXECUTABLE)
test: all
./$(EXECUTABLE)
diff --git a/tests/libsemanage-tests.c b/tests/libsemanage-tests.c
index 2ae4a21..df2d5b2 100644
--- a/tests/libsemanage-tests.c
+++ b/tests/libsemanage-tests.c
@@ -21,14 +21,6 @@
#include "test_semanage_store.h"
#include "test_utilities.h"
-#include "test_handle.h"
-#include "test_bool.h"
-#include "test_fcontext.h"
-#include "test_iface.h"
-#include "test_ibendport.h"
-#include "test_node.h"
-#include "test_port.h"
-#include "test_user.h"
#include "test_other.h"
#include <CUnit/Basic.h>
@@ -68,14 +60,6 @@ static bool do_tests(int interactive, int verbose)
DECLARE_SUITE(semanage_store);
DECLARE_SUITE(semanage_utilities);
- DECLARE_SUITE(handle);
- DECLARE_SUITE(bool);
- DECLARE_SUITE(fcontext);
- DECLARE_SUITE(iface);
- DECLARE_SUITE(ibendport);
- DECLARE_SUITE(node);
- DECLARE_SUITE(port);
- DECLARE_SUITE(user);
DECLARE_SUITE(other);
if (verbose)
--
2.19.1

View File

@ -3,16 +3,18 @@
Name: libsemanage
Version: 3.1
Release: 3
Release: 4
License: LGPLv2+
Summary: SELinux binary policy manipulation library
URL: https://github.com/SELinuxProject/selinux/wiki
Source0: https://github.com/SELinuxProject/selinux/releases/download/20200710/libsemanage-3.1.tar.gz
Source1: semanage.conf
Patch9000: fix-test-failure-with-secilc.patch
BuildRequires: gcc python3-devel bison flex bzip2-devel audit-libs-devel
BuildRequires: libselinux-devel >= %{libselinux_version} swig libsepol-devel >= %{libsepol_version}
BuildRequires: gdb
BuildRequires: gdb CUnit-devel gdb-headless
Requires: bzip2-libs audit-libs
Requires: libselinux >= %{libselinux_version}
@ -70,6 +72,9 @@ ln -sf %{_libdir}/libsemanage.so.1 %{buildroot}/%{_libdir}/libsemanage.so
%ldconfig_scriptlets
%check
make test
%files
%license COPYING
%dir %{_sysconfdir}/selinux
@ -99,6 +104,9 @@ ln -sf %{_libdir}/libsemanage.so.1 %{buildroot}/%{_libdir}/libsemanage.so
%changelog
* Sat May 22 2021 Hugel<gengqihu1@huawei.com> - 3.1-4
- enabel make test
* Thu Oct 29 2020 Hugel <gengqihu1@huawei.com> - 3.1-3
- remove the dependency on python2