Skip to content

Commit

Permalink
Merge pull request #635 from clebergnu/trinity_fix
Browse files Browse the repository at this point in the history
trinity example test: fix fetch of tarball parameter and update to 1.5
  • Loading branch information
lmr committed Jun 4, 2015
2 parents 4065952 + ff4e674 commit 5bb7a56
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions examples/tests/trinity.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class TrinityTest(test.Test):
Trinity syscall fuzzer wrapper.
:see: http://codemonkey.org.uk/projects/trinity/
:src: http://codemonkey.org.uk/projects/trinity/trinity-1.4.tar.xz (repackaged)
:src: http://codemonkey.org.uk/projects/trinity/trinity-1.5.tar.xz (repackaged)
:param tarball: Path to the trinity tarball relative to deps dir.
:param stress: Name of the syscall you want to stress.
Expand All @@ -28,9 +28,10 @@ def setUp(self):
"""
Build trinity.
"""
tarball_path = self.get_data_path(self.params.get('tarball'))
tarball = self.params.get('tarball', default='trinity-1.5.tar.bz2')
tarball_path = self.get_data_path(tarball)
archive.extract(tarball_path, self.srcdir)
self.srcdir = os.path.join(self.srcdir, 'trinity-1.4')
self.srcdir = os.path.join(self.srcdir, 'trinity-1.5')
os.chdir(self.srcdir)
process.run('./configure.sh')
build.make(self.srcdir)
Expand Down
Binary file removed examples/tests/trinity.py.data/trinity-1.4.tar.bz2
Binary file not shown.
Binary file not shown.

0 comments on commit 5bb7a56

Please sign in to comment.