Signed-off-by: Vinson Lee <[email protected]>
---
client/tests/ltp/ltp.patch | 12 ------------
client/tests/ltp/ltp.py | 6 +++---
client/tests/ltp/skipfile | 1 +
3 files changed, 4 insertions(+), 15 deletions(-)
delete mode 100644 client/tests/ltp/ltp.patch
create mode 100644 client/tests/ltp/skipfile
diff --git a/client/tests/ltp/ltp.patch b/client/tests/ltp/ltp.patch
deleted file mode 100644
index c207686..0000000
--- a/client/tests/ltp/ltp.patch
+++ /dev/null
@@ -1,12 +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:30:32.000000000 -0800
-@@ -1245,7 +1245,7 @@
- vhangup02 vhangup02
-
- #vmsplice test cases
--vmsplice01 vmsplice01
-+#vmsplice01 vmsplice01
-
- wait02 wait02
-
diff --git a/client/tests/ltp/ltp.py b/client/tests/ltp/ltp.py
index e1c0b8f..6e484fc 100644
--- a/client/tests/ltp/ltp.py
+++ b/client/tests/ltp/ltp.py
@@ -31,8 +31,6 @@ class ltp(test.test):
ltpbin_dir = os.path.join(self.srcdir, 'bin')
os.mkdir(ltpbin_dir)
- utils.system('patch -p1 < ../ltp.patch')
-
# comment the capability tests if we fail to load the capability module
try:
utils.system('modprobe capability')
@@ -56,7 +54,9 @@ class ltp(test.test):
if script == 'runltp':
logfile = os.path.join(self.resultsdir, 'ltp.log')
failcmdfile = os.path.join(self.debugdir, 'failcmdfile')
- args2 = '-q -l %s -C %s -d %s' % (logfile, failcmdfile,
self.tmpdir)
+ skipfile = os.path.join(self.bindir, 'skipfile')
+ args2 = '-q -l %s -C %s -d %s -S %s' % \
+ (logfile, failcmdfile, self.tmpdir, skipfile)
args = args + ' ' + args2
ltpbin_dir = os.path.join(self.srcdir, 'bin')
diff --git a/client/tests/ltp/skipfile b/client/tests/ltp/skipfile
new file mode 100644
index 0000000..be1345a
--- /dev/null
+++ b/client/tests/ltp/skipfile
@@ -0,0 +1 @@
+vmsplice01
--
1.7.5.4
_______________________________________________
Autotest mailing list
[email protected]
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
