On Wed, Mar 31, 2010 at 1:26 PM, Martin Bligh <[email protected]> wrote: > LGTM, please use bz2 though, it's smaller.
Ok, repackaged the tarball using bz2, final applied patch can be seen at: http://autotest.kernel.org/changeset/4357 Thanks! > On Wed, Mar 31, 2010 at 9:21 AM, Lucas Meneghel Rodrigues > <[email protected]> wrote: >> Current lmbench module shipped in autotest has the lmbench >> tarball modified from original source with a halfway applied >> patch, that was causing build issues. Fixed this by picking >> up the original tarball shipped for lmbench and applying >> the lmbench3.diff patch at test runtime, as it is standard >> practice in autotest. This patch contains the module changes, >> I am going to replace the tarballs when commiting this. >> >> After this change is made, lmbench builds and works just fine. >> >> Signed-off-by: Lucas Meneghel Rodrigues <[email protected]> >> --- >> client/tests/lmbench/lmbench.py | 24 +++++++++++++++--------- >> 1 files changed, 15 insertions(+), 9 deletions(-) >> >> diff --git a/client/tests/lmbench/lmbench.py >> b/client/tests/lmbench/lmbench.py >> index e1f0337..32e8cf9 100644 >> --- a/client/tests/lmbench/lmbench.py >> +++ b/client/tests/lmbench/lmbench.py >> @@ -11,18 +11,24 @@ class lmbench(test.test): >> self.job.require_gcc() >> >> >> - def setup(self, tarball = 'lmbench3.tar.bz2', fsdir=None, file=None): >> + def setup(self, tarball = 'lmbench3.tar.gz', fsdir=None, file=None): >> + """ >> + Uncompresses the original lmbench tarball, applies a patch to fix >> + some build issues, configures lmbench and then modifies the config >> + files to use appropriate directory and file locations. >> + >> + �...@param tarball: Lmbench tarball. >> + �...@param fsdir: Directory where file system tests will run >> + (defaults to standard test temp dir). >> + �...@param file: Path to the file lmbench will use for status output >> + (defaults to a random named file inside standard test temp >> dir). >> + �...@see: http://www.bitmover.com/lm/lmbench/lmbench3.tar.gz >> + (original tarball, shipped as is in autotest). >> + """ >> tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir) >> - # http://www.bitmover.com/lm/lmbench/lmbench3.tar.gz >> - # + lmbench3.diff >> - # - removes Makefile references to bitkeeper >> - # - default mail to no, fix job placement defaults (masouds) >> - # - adds "config" Makefile targets to perform configuration only >> - # - changes scripts/getlist to consider result files that do >> - # not start with "[lmbench 3.x..." (still requires such a line >> - # somewhere in the first 1000 bytes of the file) >> utils.extract_tarball_to_dir(tarball, self.srcdir) >> os.chdir(self.srcdir) >> + utils.system('patch -p1 < ../lmbench3.diff') >> >> # build lmbench >> utils.system('make') >> -- >> 1.6.6.1 >> >> _______________________________________________ >> 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 > -- Lucas _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
