From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9EE031381F3 for ; Tue, 27 Nov 2012 19:35:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5836C21C0CD; Tue, 27 Nov 2012 19:33:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A7AE921C0CC for ; Tue, 27 Nov 2012 19:33:56 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DBA9233D9E3 for ; Tue, 27 Nov 2012 19:33:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9F632E5454 for ; Tue, 27 Nov 2012 19:33:52 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1354044116.0f94319a163310335945a1a5a67890a074163b7c.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: eclass/ X-VCS-Repository: proj/sci X-VCS-Files: eclass/intel-sdp.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 0f94319a163310335945a1a5a67890a074163b7c X-VCS-Branch: master Date: Tue, 27 Nov 2012 19:33:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: aa88c9f4-b30c-4152-9f9a-8d8b73846403 X-Archives-Hash: 0cbd66d1432784246ae53d392ff6834d commit: 0f94319a163310335945a1a5a67890a074163b7c Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 23 19:09:16 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Nov 27 19:21:56 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0f94319a Drop old testing functions --- eclass/intel-sdp.eclass | 73 ++-------------------------------------------- 1 files changed, 4 insertions(+), 69 deletions(-) diff --git a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass index 2037ed3..a7d2c22 100644 --- a/eclass/intel-sdp.eclass +++ b/eclass/intel-sdp.eclass @@ -200,9 +200,11 @@ _version-test() { local _comp _comp_full _arch _file _warn case ${PN} in ifc ) + debug-print "Testing ifort" _comp=ifort ;; icc ) + debug-print "Testing icc" _comp=icc ;; *) @@ -232,80 +234,13 @@ _version-test() { [[ "${_warn}" == "yes" ]] && big-warning test-failed } -# @ECLASS-FUNCTION: _compile-test -# @INTERNAL -# Testing for valid license with small compile test -_compile-test() { - local _comp _comp_full _arch _file _warn - case ${1} in - fortran ) - _file="${T}/${1}.f" - cat > "${_file}" <<- EOF - end - EOF - _comp=ifort - ;; - c ) - _file="${T}/${1}.c" - cat > "${_file}" <<- EOF - main() { - ; - } - EOF - _comp=icc - ;; - *) - die "This ${1} is not supported for testing" - ;; - esac - - for _arch in ${INTEL_ARCH}; do - case ${EBUILD_PHASE} in - install ) - _comp_full="${ED}/${INTEL_SDP_DIR}/bin/${_arch}/${_comp}" - ;; - postinst ) - _comp_full="${INTEL_SDP_EDIR}/bin/${_arch}/${_comp}" - ;; - * ) - ewarn "Compile test not supported in ${EBUILD_PHASE}" - continue - ;; - esac - -# debug-print "LD_LIBRARY_PATH=\"${INTEL_SDP_EDIR}/bin/${_arch}/\" \"${_comp_full}\" -c \"${_file}" - -# LD_LIBRARY_PATH="${INTEL_SDP_EDIR}/bin/${_arch}/" "${_comp_full}" -c "${_file}" &>/dev/null - - debug-print "LD_LIBRARY_PATH=\"${INTEL_SDP_EDIR}/bin/${_arch}/\" \"${_comp_full}\" -V" - - LD_LIBRARY_PATH="${INTEL_SDP_EDIR}/bin/${_arch}/" "${_comp_full}" -V &>/dev/null - [[ $? -ne 0 ]] && _warn=yes - done - [[ "${_warn}" == "yes" ]] && big-warning test-failed -} - -# @ECLASS-FUNCTION: _compile-fortran -# @INTERNAL -# Run fortran compile test -_compile-fortran() { _compile-test fortran; } - -# @ECLASS-FUNCTION: _compile-c -# @INTERNAL -# Run c compile test -_compile-c() { _compile-test c; } - # @ECLASS-FUNCTION: run-test # @INTERNAL # Test if installed compiler is working run-test() { case ${PN} in - ifc ) - debug-print "Testing ifort" - _compile-fortran ;; - icc ) - debug-print "Testing icc" - _compile-c ;; + ifc | icc ) + _version_test ;; * ) debug-print "No test available for ${PN}" ;;