Skip to content

Commit 5d08a5e

Browse files
author
kalibera
committed
Fix regular expression in test for multi-byte characters in C locale (fixes
installation tests on Windows). git-svn-id: https://svn.r-project.org/R/trunk@88079 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 20dfd36 commit 5d08a5e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

tests/reg-tests-1e.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1471,8 +1471,9 @@ if(inherits(oL, "warning")) {
14711471
if(attr(oL, "ok") && capabilities("NLS") && !is.na(.popath)
14721472
&& !grepl("macOS", osVersion) # macOS fails currently
14731473
) {
1474+
## .+ to work with multi-byte characters in C encoding
14741475
stopifnot(is.character(print("checking 'out' : ")),
1475-
grepl("^argument non num.rique pour un ", out))
1476+
grepl("^argument non num.+rique pour un ", out))
14761477
## was *not* switched to French (when this was run via 'make ..')
14771478
## reset {just in case}:
14781479
Sys.setLanguage("en")

0 commit comments

Comments
 (0)