amend c87492 for BLAS/LAPACK case

git-svn-id: https://svn.r-project.org/R/trunk@87617 00db46b3-68df-0310-9c12-caf00c1e9a41

tests/reg-tests-1e.R

@@ -1700,11 +1700,21 @@ options(op) # return to sanity + warn=2
 si <- sessionInfo()
 str( osi <- capture.output(si)); hasLA <- nzchar(si$LAPACK); si$LAPACK <- ""
 osi.noLA <- capture.output(si)
-iLA <- which(osi != osi.noLA)
-cbind(osi, osi.noLA)[iLA,] # was empty ..
+if(any(gBL <- grepl("^BLAS/LAPACK:", osi))) {
+    ##  *.noLA will have _2_ lines instead, as LAPACK != BLAS now
+    print(osi[[iLA <- which(gBL)]])
+    v.iLA <- sub(".*; ", " ", osi[iLA])
+    v.noLA <- osi.noLA[iLA+1L]
+} else {
+    stopifnot(length(osi) == length(osi.noLA))
+    iLA <- which(osi != osi.noLA)
+    print(cbind(osi, osi.noLA)[iLA,]) # was empty ..
+    v.iLA <- osi[iLA]
+    v.noLA <- osi.noLA[iLA]
+}
 if(length(iLA) && nzchar(La_version())) { cat("sessionInfo - La_* checking: ")
-    stopifnot(nzchar(v.noLA <- osi.noLA[iLA]),
-              grepl(paste0(v.noLA,"$"),  osi[iLA]))
+    stopifnot(nzchar(v.noLA),
+              grepl(paste0(v.noLA,"$"),  v.iLA))
     cat("ok\n")
 }
 ## the "LAPACK: .." was entirely empty when  si$LAPACK was ""