Drop old testing functions

1 files changed, 4 insertions, 69 deletions

diff --git a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass
index 2037ed3b6..a7d2c22b1 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}"
             ;;