On 02/23/2012 04:15 AM, Vinson Lee wrote: > Ping. Applied:
https://github.com/autotest/autotest/commit/21a585b5cf1268181dc645539d8f216b8ad9e579 Thanks! > On Fri, Feb 17, 2012 at 5:36 PM, Vinson Lee<[email protected]> wrote: >> The capability module is built-in into the Linux kernel since 2.6.24. >> >> Tested the re-enabled tests capget01, capget02, capset01, and capset02 >> from ltp-20110104. They pass on the following distros. >> Centos 5 - 2.6.18-274.18.1.e15 >> Ubuntu 8.04 - 2.6.24-30-generic >> Ubuntu 10.04 - 2.6.32-38-generic >> Ubuntu 12.04 - 3.2.0-16-generic >> Fedora FC16 - 3.2.6-3.fc16.x86_64 >> >> Signed-off-by: Vinson Lee<[email protected]> >> --- >> client/tests/ltp/ltp.py | 6 ------ >> client/tests/ltp/ltp_capability.patch | 19 ------------------- >> 2 files changed, 0 insertions(+), 25 deletions(-) >> delete mode 100644 client/tests/ltp/ltp_capability.patch >> >> diff --git a/client/tests/ltp/ltp.py b/client/tests/ltp/ltp.py >> index 6e484fc..71ed1db 100644 >> --- a/client/tests/ltp/ltp.py >> +++ b/client/tests/ltp/ltp.py >> @@ -31,12 +31,6 @@ class ltp(test.test): >> ltpbin_dir = os.path.join(self.srcdir, 'bin') >> os.mkdir(ltpbin_dir) >> >> - # comment the capability tests if we fail to load the capability >> module >> - try: >> - utils.system('modprobe capability') >> - except error.CmdError, detail: >> - utils.system('patch -p1< ../ltp_capability.patch') >> - >> utils.system('cp ../scan.c pan/') # saves having lex installed >> utils.configure('--prefix=%s' % ltpbin_dir) >> utils.make('-j %d all' % utils.count_cpus()) >> diff --git a/client/tests/ltp/ltp_capability.patch >> b/client/tests/ltp/ltp_capability.patch >> deleted file mode 100644 >> index 6b99d12..0000000 >> --- a/client/tests/ltp/ltp_capability.patch >> +++ /dev/null >> @@ -1,19 +0,0 @@ >> -diff -urN ltp-full-20091231_vanilla/runtest/syscalls >> ltp-full-20091231/runtest/syscalls >> ---- ltp-full-20091231_vanilla/runtest/syscalls 2010-01-05 >> 17:16:06.000000000 -0800 >> -+++ ltp-full-20091231/runtest/syscalls 2010-01-05 17:27:50.000000000 -0800 >> -@@ -35,11 +35,11 @@ >> - >> - brk01 brk01 >> - >> --capget01 capget01 >> --capget02 capget02 >> -+#capget01 capget01 >> -+#capget02 capget02 >> - >> --capset01 capset01 >> --capset02 capset02 >> -+#capset01 capset01 >> -+#capset02 capset02 >> - >> - cacheflush01 cacheflush01 >> - >> -- >> 1.7.5.4 >> > _______________________________________________ > Autotest mailing list > [email protected] > http://test.kernel.org/cgi-bin/mailman/listinfo/autotest _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
