Hi, The following patch reverts a wrong patch that has been commited accidentally,
http://article.gmane.org/gmane.linux.ltp/7459 Signed-off-by: CAI Qian <[email protected]> --- m4/ltp-common.m4 2009-02-16 10:24:39.000000000 +0800 +++ /dev/null 2009-02-16 04:35:01.884129746 +0800 @@ -1,35 +0,0 @@ -dnl -dnl Copyright (c) Red Hat Inc., 2009 -dnl -dnl This program is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU General Public License as -dnl published by the Free Software Foundation; either version 2 of -dnl the License, or (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See -dnl the GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -dnl USA -dnl -dnl Author: Masatake YAMATO <[email protected]> -dnl - -# LTP_CHECK_LIB(/LIBRARY/,/FUNCTIONS/,[/OTHER-LIBRARIES/]) -# -------------------------------------------------- -# LTP_CHECK_LIB works like AC_CHECK_LIB. -# But it is customized for LTP. -# -# 1. LIBS is not updated even if /FUNCTION/ is found in /LIBRARY/. -# 2. Instead of LIBS, /LIBRARY/_LIBS is set. -# 3. LIBS_/LIBRARY/ is passed to AC_SUBST. -# -AC_DEFUN([LTP_CHECK_LIB],LIBRARY_LIBS -[AH_TEMPLATE(AS_TR_CPP([HAVE_LIB$1]), -[Define to 1 if you have the `$1' library (-l$1).]) -AC_CHECK_LIB($1,$2,[AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1)) AS_TR_CPP([$1_LIBS])="-l$1 $3"],,$3) -AC_SUBST(AS_TR_CPP([$1_LIBS]))]) --- m4/ltp-selinux.m4.orig 2009-02-16 10:24:39.000000000 +0800 +++ m4/ltp-selinux.m4 2009-02-16 10:23:59.000000000 +0800 @@ -22,6 +22,8 @@ dnl AC_DEFUN([LTP_CHECK_SELINUX], [dnl -AC_CHECK_HEADERS(selinux/selinux.h) -LTP_CHECK_LIB(selinux,is_selinux_enabled) +AC_CHECK_HEADERS(selinux/selinux.h,[ + SELINUX_LIBS="-lselinux"],[ + SELINUX_LIBS=""]) +AC_SUBST(SELINUX_LIBS) ]) --- testcases/kernel/fs/proc/proc01.c.orig 2009-02-16 10:24:40.000000000 +0800 +++ testcases/kernel/fs/proc/proc01.c 2009-02-16 10:24:21.000000000 +0800 @@ -107,12 +107,19 @@ /* If a particular LSM is enabled, it is expected that some entries can be read successfully. */ +#ifdef HAVE_SELINUX_SELINUX_H const char lsm_should_work[][PATH_MAX] = { "/proc/self/attr/*", "/proc/self/task/[0-9]*/attr/*", "" }; +#else +const char lsm_should_work[][PATH_MAX] = + { + "" + }; +#endif /* Known files that does not honor O_NONBLOCK, so they will hang the test while being read. */ @@ -125,7 +132,7 @@ /* Check if a particular LSM is enabled. */ int is_lsm_enabled(void) { -#if defined(HAVE_SELINUX_SELINUX_H) && defined(HAVE_LIBSELINUX) +#ifdef HAVE_SELINUX_SELINUX_H return is_selinux_enabled(); #else return 0; ------------------------------------------------------------------------------ Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
