Enabled the tests to complete correctly

This required an overloaded ilaenv2stage in the ilaenv.f in the test
directories to use the PARMS(1) for ISPEC == 17.

Signed-off-by: Nick Papior <nickpapior@gmail.com>

Author: zerothi

SRC/ilaenv.f

@@ -84,9 +84,6 @@
 *>          12 <= ISPEC <= 16:
 *>               xHSEQR or related subroutines,
 *>               see IPARMQ for detailed explanation
-*>          17 <= ISPEC <= 21:
-*>               *_2STAGE or related subroutines,
-*>               see IPARAM2STAGE for detailed explanation
 *> \endverbatim
 *>
 *> \param[in] NAME
@@ -192,8 +189,7 @@ INTEGER FUNCTION ILAENV( ISPEC, NAME, OPTS, N1, N2, N3, N4 )
 *     .. Executable Statements ..
 *
       GO TO ( 10, 10, 10, 80, 90, 100, 110, 120,
-     $        130, 140, 150, 160, 160, 160, 160, 160,
-     $        170, 170, 170, 170, 170 )ISPEC
+     $        130, 140, 150, 160, 160, 160, 160, 160)ISPEC
 *
 *     Invalid value for ISPEC
 *
@@ -693,13 +689,6 @@ INTEGER FUNCTION ILAENV( ISPEC, NAME, OPTS, N1, N2, N3, N4 )
 *
       ILAENV = IPARMQ( ISPEC, NAME, OPTS, N1, N2, N3, N4 )
       RETURN
-*
-  170 CONTINUE
-*
-*     17 <= ISPEC <= 21: 2stage eigenvalues and SVD or related subroutines.
-*
-      ILAENV = IPARAM2STAGE( ISPEC, NAME, OPTS, N1, N2, N3, N4 )
-      RETURN
 *
 *     End of ILAENV
 *

SRC/ilaenv2stage.f

@@ -152,22 +152,24 @@ INTEGER FUNCTION ILAENV2STAGE( ISPEC, NAME, OPTS, N1, N2, N3, N4 )
 *  -- LAPACK auxiliary routine (version 3.7.0) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
 *  -- Univ. of California Berkeley, Univ. of Colorado Denver and NAG Ltd..--
-*     December 2016
+*     July 2017
 *
 *     .. Scalar Arguments ..
       CHARACTER*( * )    NAME, OPTS
-      INTEGER            ISPEC, IISPEC, N1, N2, N3, N4
+      INTEGER            ISPEC, N1, N2, N3, N4
 *     ..
 *
 *  =====================================================================
-*
+*     ..
+*     .. Local Scalars ..
+      INTEGER            IISPEC
+*     ..
 *     .. External Functions ..
       INTEGER            IPARAM2STAGE
       EXTERNAL           IPARAM2STAGE
 *     ..
 *     .. Executable Statements ..
 *
-      IISPEC = 16 + ISPEC
       GO TO ( 10, 10, 10, 10, 10 )ISPEC
 *
 *     Invalid value for ISPEC
@@ -179,6 +181,7 @@ INTEGER FUNCTION ILAENV2STAGE( ISPEC, NAME, OPTS, N1, N2, N3, N4 )
 *
 *     2stage eigenvalues and SVD or related subroutines.
 *
+      IISPEC = 16 + ISPEC
       ILAENV2STAGE = IPARAM2STAGE( IISPEC, NAME, OPTS,
      $                             N1, N2, N3, N4 )
       RETURN

TESTING/EIG/ilaenv.f

@@ -250,6 +250,53 @@ INTEGER          FUNCTION ILAENV( ISPEC, NAME, OPTS, N1, N2, N3,
 *
 *     End of ILAENV
 *
+      END
+      INTEGER FUNCTION ILAENV2STAGE( ISPEC, NAME, OPTS, N1, N2,
+     $                               N3, N4 )
+*     .. Scalar Arguments ..
+      CHARACTER*( * )    NAME, OPTS
+      INTEGER            ISPEC, N1, N2, N3, N4
+*     ..
+*
+*  =====================================================================
+*
+*     .. Local variables ..
+      INTEGER            IISPEC
+*     .. External Functions ..
+      INTEGER            IPARAM2STAGE
+      EXTERNAL           IPARAM2STAGE
+*     ..
+*     .. Arrays in Common ..
+      INTEGER            IPARMS( 100 )
+*     ..
+*     .. Common blocks ..
+      COMMON             / CLAENV / IPARMS
+*     ..
+*     .. Save statement ..
+      SAVE               / CLAENV /
+*     ..
+*     .. Executable Statements ..
+*
+      IF(( ISPEC.GE.1 ) .AND. (ISPEC.LE.5)) THEN
+*
+*     1 <= ISPEC <= 5: 2stage eigenvalues SVD routines. 
+*
+         IF( ISPEC.EQ.1 ) THEN
+             ILAENV2STAGE = IPARMS( 1 )
+         ELSE
+             IISPEC = 16 + ISPEC
+             ILAENV2STAGE = IPARAM2STAGE( IISPEC, NAME, OPTS,
+     $                                    N1, N2, N3, N4 ) 
+         ENDIF
+*
+      ELSE
+*
+*        Invalid value for ISPEC
+*
+         ILAENV2STAGE = -1
+      END IF
+*
+      RETURN
       END
       INTEGER FUNCTION IPARMQ( ISPEC, NAME, OPTS, N, ILO, IHI, LWORK )
 *

TESTING/LIN/ilaenv.f

@@ -244,3 +244,50 @@ INTEGER          FUNCTION ILAENV( ISPEC, NAME, OPTS, N1, N2, N3,
 *     End of ILAENV
 *
       END
+      INTEGER FUNCTION ILAENV2STAGE( ISPEC, NAME, OPTS, N1, N2,
+     $                               N3, N4 )
+*     .. Scalar Arguments ..
+      CHARACTER*( * )    NAME, OPTS
+      INTEGER            ISPEC, N1, N2, N3, N4
+*     ..
+*
+*  =====================================================================
+*
+*     .. Local variables ..
+      INTEGER            IISPEC
+*     .. External Functions ..
+      INTEGER            IPARAM2STAGE
+      EXTERNAL           IPARAM2STAGE
+*     ..
+*     .. Arrays in Common ..
+      INTEGER            IPARMS( 100 )
+*     ..
+*     .. Common blocks ..
+      COMMON             / CLAENV / IPARMS
+*     ..
+*     .. Save statement ..
+      SAVE               / CLAENV /
+*     ..
+*     .. Executable Statements ..
+*
+      IF(( ISPEC.GE.1 ) .AND. (ISPEC.LE.5)) THEN
+*
+*     1 <= ISPEC <= 5: 2stage eigenvalues SVD routines. 
+*
+         IF( ISPEC.EQ.1 ) THEN
+             ILAENV2STAGE = IPARMS( 1 )
+         ELSE
+             IISPEC = 16 + ISPEC
+             ILAENV2STAGE = IPARAM2STAGE( IISPEC, NAME, OPTS,
+     $                                    N1, N2, N3, N4 ) 
+         ENDIF
+*
+      ELSE
+*
+*        Invalid value for ISPEC
+*
+         ILAENV2STAGE = -1
+      END IF
+*
+      RETURN
+      END