Skip to content

Commit 208f0e9

Browse files
author
maechler
committed
amend c87492 for BLAS/LAPACK case
git-svn-id: https://svn.r-project.org/R/trunk@87617 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent e14a1ec commit 208f0e9

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

tests/reg-tests-1e.R

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1700,11 +1700,21 @@ options(op) # return to sanity + warn=2
17001700
si <- sessionInfo()
17011701
str( osi <- capture.output(si)); hasLA <- nzchar(si$LAPACK); si$LAPACK <- ""
17021702
osi.noLA <- capture.output(si)
1703-
iLA <- which(osi != osi.noLA)
1704-
cbind(osi, osi.noLA)[iLA,] # was empty ..
1703+
if(any(gBL <- grepl("^BLAS/LAPACK:", osi))) {
1704+
## *.noLA will have _2_ lines instead, as LAPACK != BLAS now
1705+
print(osi[[iLA <- which(gBL)]])
1706+
v.iLA <- sub(".*; ", " ", osi[iLA])
1707+
v.noLA <- osi.noLA[iLA+1L]
1708+
} else {
1709+
stopifnot(length(osi) == length(osi.noLA))
1710+
iLA <- which(osi != osi.noLA)
1711+
print(cbind(osi, osi.noLA)[iLA,]) # was empty ..
1712+
v.iLA <- osi[iLA]
1713+
v.noLA <- osi.noLA[iLA]
1714+
}
17051715
if(length(iLA) && nzchar(La_version())) { cat("sessionInfo - La_* checking: ")
1706-
stopifnot(nzchar(v.noLA <- osi.noLA[iLA]),
1707-
grepl(paste0(v.noLA,"$"), osi[iLA]))
1716+
stopifnot(nzchar(v.noLA),
1717+
grepl(paste0(v.noLA,"$"), v.iLA))
17081718
cat("ok\n")
17091719
}
17101720
## the "LAPACK: .." was entirely empty when si$LAPACK was ""

0 commit comments

Comments
 (0)