Fix tests with locales

This commit is contained in:
Jenny Tam 2017-12-29 12:00:00 -08:00
parent 870c23f7a7
commit 62944347ef
11 changed files with 30 additions and 73 deletions

View file

@ -442,6 +442,16 @@ function handleErrors()
} }
} }
function setUSLocale()
{
if (!isWindows()) {
// macOS the locale names are different in Linux or macOS
$locale = strtoupper(PHP_OS) === 'LINUX' ? "en_US.ISO-8859-1" : "en_US.ISO8859-1";
setlocale(LC_ALL, $locale);
}
}
// non-UTF8 locale support in ODBC 17 and above only // non-UTF8 locale support in ODBC 17 and above only
// if AE enabled, only supported in Windows (AE limitations) // if AE enabled, only supported in Windows (AE limitations)
function isLocaleSupported() function isLocaleSupported()

View file

@ -8,9 +8,7 @@ PHPT_EXEC=true
--SKIPIF-- --SKIPIF--
<?php <?php
// locale must be set before 1st connection // locale must be set before 1st connection
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
require('skipif_versions_old.inc'); require('skipif_versions_old.inc');
?> ?>
--FILE-- --FILE--
@ -90,10 +88,7 @@ function prepareAndExecute($noPasses)
} }
// locale must be set before 1st connection // locale must be set before 1st connection
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
$testName = "Statement - Prepare and Execute"; $testName = "Statement - Prepare and Execute";
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above) // test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)

View file

@ -8,9 +8,7 @@ PHPT_EXEC=true
--SKIPIF-- --SKIPIF--
<?php <?php
// locale must be set before 1st connection // locale must be set before 1st connection
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
require('skipif_versions_old.inc'); require('skipif_versions_old.inc');
?> ?>
--FILE-- --FILE--
@ -68,10 +66,7 @@ function fetchFields()
} }
// locale must be set before 1st connection // locale must be set before 1st connection
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
$testName = "Fetch - Field"; $testName = "Fetch - Field";
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above) // test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)

View file

@ -5,9 +5,7 @@ PHPT_EXEC=true
--SKIPIF-- --SKIPIF--
<? <?
// locale must be set before 1st connection // locale must be set before 1st connection
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
require('skipif_versions_old.inc'); require('skipif_versions_old.inc');
?> ?>
--FILE-- --FILE--
@ -97,10 +95,7 @@ function checkData($col, $actual, $expected)
return ($success); return ($success);
} }
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
$testName = "Fetch - Field Data"; $testName = "Fetch - Field Data";
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above) // test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)

View file

@ -8,9 +8,7 @@ PHPT_EXEC=true
--SKIPIF-- --SKIPIF--
<? <?
// locale must be set before 1st connection // locale must be set before 1st connection
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
require('skipif_versions_old.inc'); require('skipif_versions_old.inc');
?> ?>
--FILE-- --FILE--
@ -153,11 +151,7 @@ function checkData($row, $stmt, $index, $mode)
} }
// locale must be set before 1st connection // locale must be set before 1st connection
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
global $testName;
$testName = "Fetch - Array"; $testName = "Fetch - Array";
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above) // test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)

View file

@ -7,9 +7,7 @@ PHPT_EXEC=true
--SKIPIF-- --SKIPIF--
<?php <?php
// locale must be set before 1st connection // locale must be set before 1st connection
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
require('skipif_versions_old.inc'); require('skipif_versions_old.inc');
?> ?>
--FILE-- --FILE--
@ -128,10 +126,7 @@ function checkData($rows, $fields, $actualValues, $expectedValues)
} }
// locale must be set before 1st connection // locale must be set before 1st connection
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
$testName = "Fetch - Object"; $testName = "Fetch - Object";
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above) // test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)

View file

@ -7,9 +7,7 @@ PHPT_EXEC=true
--SKIPIF-- --SKIPIF--
<? <?
// locale must be set before 1st connection // locale must be set before 1st connection
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
require('skipif_versions_old.inc'); require('skipif_versions_old.inc');
?> ?>
--FILE-- --FILE--
@ -86,11 +84,7 @@ function fetchFields()
} }
// locale must be set before 1st connection // locale must be set before 1st connection
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
global $testName;
$testName = "Fetch - Next Result"; $testName = "Fetch - Next Result";
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above) // test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)

View file

@ -7,9 +7,7 @@ PHPT_EXEC=true
--SKIPIF-- --SKIPIF--
<?php <?php
// locale must be set before 1st connection // locale must be set before 1st connection
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
require('skipif_versions_old.inc'); require('skipif_versions_old.inc');
?> ?>
--FILE-- --FILE--
@ -137,10 +135,7 @@ function checkData($rows, $fields, $actualValues, $expectedValues)
} }
// locale must be set before 1st connection // locale must be set before 1st connection
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
$testName = "Fetch - Scrollable"; $testName = "Fetch - Scrollable";
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above) // test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)

View file

@ -7,9 +7,7 @@ can be successfully retrieved as streams.
PHPT_EXEC=true PHPT_EXEC=true
--SKIPIF-- --SKIPIF--
<?// locale must be set before 1st connection <?// locale must be set before 1st connection
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
require('skipif_versions_old.inc'); require('skipif_versions_old.inc');
?> ?>
--FILE-- --FILE--
@ -126,10 +124,7 @@ function checkData($col, $actual, $expected)
} }
// locale must be set before 1st connection // locale must be set before 1st connection
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
global $testName; global $testName;
$testName = "Stream - Read"; $testName = "Stream - Read";

View file

@ -7,9 +7,7 @@ PHPT_EXEC=true
--SKIPIF-- --SKIPIF--
<? <?
// locale must be set before 1st connection // locale must be set before 1st connection
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
require('skipif_versions_old.inc'); require('skipif_versions_old.inc');
?> ?>
--FILE-- --FILE--
@ -163,11 +161,7 @@ function checkData($col, $actual, $expected)
} }
// locale must be set before 1st connection // locale must be set before 1st connection
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
global $testName;
$testName = "Stream - Scrollable"; $testName = "Stream - Scrollable";
// error message expected with AE enabled // error message expected with AE enabled

View file

@ -3,10 +3,7 @@ streaming large amounts of data into a database and getting it out as a string e
--SKIPIF-- --SKIPIF--
<? <?
// locale must be set before 1st connection // locale must be set before 1st connection
if (!isWindows() ) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
require('skipif.inc'); require('skipif.inc');
?> ?>
--FILE-- --FILE--
@ -254,9 +251,7 @@ function CompareLengths($filesizes, $lens1, $lens2, $count, $useUTF8)
} }
// locale must be set before 1st connection // locale must be set before 1st connection
if (!isWindows()) { setUSLocale();
setlocale(LC_ALL, "en_US.ISO-8859-1");
}
// test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above) // test ansi only if windows or non-UTF8 locales are supported (ODBC 17 and above)
if (isLocaleSupported()) { if (isLocaleSupported()) {