diff options
| author |   Rick Farina <zerochaos@gentoo.org> | 2012-10-08 23:17:21 +0000 |
|---|---|---|
| committer | Rick Farina <zerochaos@gentoo.org> | 2012-10-08 23:17:21 +0000 |
| commit | d0f530e5f5d6be1b5cfb6b09f3e1e6fa29aad69c (patch) | |
| tree | 46c7c7661564e379e9ecc9b740484f1fb7d981cf /app-crypt | |
| parent | Remove old. (diff) | |
| download | gentoo-2-d0f530e5f5d6be1b5cfb6b09f3e1e6fa29aad69c.tar.gz gentoo-2-d0f530e5f5d6be1b5cfb6b09f3e1e6fa29aad69c.tar.bz2 gentoo-2-d0f530e5f5d6be1b5cfb6b09f3e1e6fa29aad69c.zip | |
restore test functionality when possible, stub out for later opencl fixes
(Portage version: 2.1.11.24/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/johntheripper/ChangeLog | 5 | ||||
| -rw-r--r-- | app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild | 32 |
2 files changed, 17 insertions, 20 deletions
diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog index b463f6f207de..ce685dc72981 100644 --- a/app-crypt/johntheripper/ChangeLog +++ b/app-crypt/johntheripper/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-crypt/johntheripper # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.145 2012/10/06 23:28:17 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.146 2012/10/08 23:17:21 zerochaos Exp $ + + 08 Oct 2012; Rick Farina <zerochaos@gentoo.org> johntheripper-1.7.9-r5.ebuild: + restore test functionality when possible, stub out for later opencl fixes 06 Oct 2012; Rick Farina <zerochaos@gentoo.org> johntheripper-1.7.9-r5.ebuild: restricting test per 437426, happy to add it back if it ever works right diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild index 373d5f29d57b..a595ecbb928b 100644 --- a/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild +++ b/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild,v 1.2 2012/10/06 23:28:17 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r5.ebuild,v 1.3 2012/10/08 23:17:21 zerochaos Exp $ EAPI="4" @@ -33,9 +33,6 @@ RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 ) opencl? ( virtual/opencl )" DEPEND="${RDEPEND}" -#per bug #437426 -RESTRICT="test" - S="${WORKDIR}/${MY_P}" has_xop() { @@ -193,21 +190,18 @@ src_compile() { $(get_target) } -#src_test() { -# cd run -# if [[ -f "${EPREFIX}/etc/john/john.conf" || -f "${EPREFIX}/etc/john/john.ini" ]] ; then - # This requires that MPI is actually 100% online on your system, which might not - # be the case, depending on which MPI implementation you are using. - #if use mpi; then - # mpirun -np 2 ./john --test || die "self test failed" - #else - -# pax-mark -mr john -# ./john --test || die 'self test failed' -# else -# ewarn "Tests require '${EPREFIX}/etc/john/john.conf' or '${EPREFIX}/etc/john/john.ini'" -# fi -#} +src_test() { + if use opencl; then + cp src/opencl/*.cl run/ + cp src/opencl_*.h run/ + fi + pax-mark -mr run/john + if use opencl || use cuda; then + ewarn "GPU tests fail, skipping all tests..." + else + make -C src/ check + fi +} src_install() { # executables |