Skip to content

Commit

Permalink
Added additional check in skipif for ansi locale tests (#1129)
Browse files Browse the repository at this point in the history
  • Loading branch information
yitam authored Apr 17, 2020
1 parent 92f9810 commit 14dbf79
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
1 change: 1 addition & 0 deletions test/functional/pdo_sqlsrv/MsSetup.inc
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ $daasMode = false;
$marsMode = true;
$dsnMode = true;
$traceEnabled = false;
$localeDisabled = false;

// column encryption variables
$keystore = "none"; // key store provider, acceptable values are none, win, ksp, akv
Expand Down
5 changes: 5 additions & 0 deletions test/functional/pdo_sqlsrv/skipif_unix_ansitests.inc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ if (!extension_loaded("pdo_sqlsrv")) {
die("skip Extension not loaded");
}

require_once('MsSetup.inc');
if ($localeDisabled) {
die("skip not set up to test ansi locale");
}

$loc = setlocale(LC_ALL, 'fr_FR@euro');
if (empty($loc)) {
die("skip required French locale not available");
Expand Down
5 changes: 5 additions & 0 deletions test/functional/sqlsrv/skipif_unix_ansitests.inc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ if (!extension_loaded("sqlsrv")) {
die("skip extension not loaded");
}

require_once('MsSetup.inc');
if ($localeDisabled) {
die("skip not set up to test ansi locale");
}

$loc = setlocale(LC_ALL, 'fr_FR@euro');
if (empty($loc)) {
die("skip required French locale not available");
Expand Down

0 comments on commit 14dbf79

Please sign in to comment.