[Branch,~linaro-validation/lava-test/trunk] Rev 158: Update LTP test to 20120401.

Message ID 20120606175015.22373.73056.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Fathi Boudra June 6, 2012, 5:50 p.m.
Merge authors:
  Fathi Boudra (fboudra)
Related merge proposals:
  https://code.launchpad.net/~fboudra/lava-test/update-ltp-test-20120104/+merge/107740
  proposed by: Fathi Boudra (fboudra)
  review: Approve - Michael Hudson-Doyle (mwhudson)
------------------------------------------------------------
revno: 158 [merge]
committer: Fathi Boudra <fathi.boudra@linaro.org>
branch nick: lava-test
timestamp: Wed 2012-06-06 20:46:56 +0300
message:
  Update LTP test to 20120401.
modified:
  lava_test/test_definitions/ltp.py


--
lp:lava-test
https://code.launchpad.net/~linaro-validation/lava-test/trunk

You are subscribed to branch lp:lava-test.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-test/trunk/+edit-subscription

Patch

=== modified file 'lava_test/test_definitions/ltp.py'
--- lava_test/test_definitions/ltp.py	2012-03-08 19:22:21 +0000
+++ lava_test/test_definitions/ltp.py	2012-05-29 03:35:23 +0000
@@ -1,4 +1,4 @@ 
-#, Copyright (c) 2010, 2011 Linaro
+# Copyright (c) 2010-2012 Linaro
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,33 +24,25 @@ 
 
 import re
 
-
 from lava_test.core.installers import TestInstaller
 from lava_test.core.parsers import TestParser
 from lava_test.core.runners import TestRunner
 from lava_test.core.tests import Test
 
-
-VERSION = "20100831"
-URL = ('http://downloads.sourceforge.net/project/ltp/'
-       'LTP Source/ltp-%s/ltp-full-%s.bz2') % (VERSION, VERSION)
-MD5 = "6982c72429a62f3917c13b2d529ad1ce"
-DEPS = ['bzip2', 'flex', 'bison', 'make', 'build-essential']
-
-SCRIPT = """
-tar -xjf ltp-full-20100831.bz2
-mkdir build
-cd ltp-full-20100831
-./configure --prefix=$(readlink -f ../build)
-make all
-SKIP_IDCHECK=1 make install
-"""
+VERSION = "20120401"
+INSTALLSTEPS = ['tar --strip-components=1 -jxf ltp-full-%s.bz2' % VERSION,
+                'mkdir build',
+                './configure --prefix=$(readlink -f build)',
+                'make all',
+                'make SKIP_IDCHECK=1 install']
+DEPS = ['bzip2', 'flex', 'bison', 'build-essential']
+URL = ("http://downloads.sourceforge.net/project/ltp/LTP Source/"
+       "ltp-%s/ltp-full-%s.bz2") % (VERSION, VERSION)
+MD5 = "e1d0acf1a6b6da0cb30dc1b0dcf5f26d"
+
+RUNSTEPS = ['cd build && sudo ./runltp $(OPTIONS)']
 DEFAULT_OPTIONS = "-f syscalls -p -q"
 
-INSTALLSTEPS = ["echo '%s' > installltp.sh" % SCRIPT,
-                'chmod +x installltp.sh',
-                './installltp.sh']
-RUNSTEPS = ['cd build && sudo ./runltp $(OPTIONS)']
 PATTERN = (
     "^(?P<test_case_id>\S+)"
     "    (?P<subid>\d+)"
@@ -64,7 +56,6 @@ 
     "TPASS": "pass",
     "TWARN": "unknown"}
 
-
 class LTPParser(TestParser):
 
     def parse(self, artifacts):
@@ -84,7 +75,6 @@ 
                     self.results['test_results'].append(
                         self.analyze_test_result(results))
 
-
 installer = TestInstaller(INSTALLSTEPS, deps=DEPS, url=URL, md5=MD5)
 runner = TestRunner(RUNSTEPS, default_options=DEFAULT_OPTIONS)
 parser = LTPParser(PATTERN, fixupdict=FIXUPS)