diff options
| author | Anatol Belski <ab@php.net> | 2018-05-19 13:11:39 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-05-19 13:11:39 +0200 |
| commit | aebbf38df55971d105c8ceabc6f1492a9a31b523 (patch) | |
| tree | 7b75734ee3f8feb39849bce3f5d69f90c6af02f3 | |
| parent | 6fc405e851703f22255f81123a16c2b10a429325 (diff) | |
| parent | 83626ef97ac55064fdbee22ff18474e5a1f135b9 (diff) | |
| download | php-git-aebbf38df55971d105c8ceabc6f1492a9a31b523.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Refix the tests once more
| -rw-r--r-- | ext/bcmath/tests/bug72093-win32.phpt | 5 | ||||
| -rw-r--r-- | ext/bcmath/tests/bug75178-win32.phpt | 10 |
2 files changed, 5 insertions, 10 deletions
diff --git a/ext/bcmath/tests/bug72093-win32.phpt b/ext/bcmath/tests/bug72093-win32.phpt index 7b1d3b9d9f..5ee9b068b3 100644 --- a/ext/bcmath/tests/bug72093-win32.phpt +++ b/ext/bcmath/tests/bug72093-win32.phpt @@ -6,13 +6,11 @@ if(!extension_loaded("bcmath")) print "skip"; if (substr(PHP_OS, 0, 3) != 'WIN') { die('skip valid only for windows'); } - $cur = PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD; $req = "10.0.17134"; if (version_compare($cur, $req) >= 0) { echo "skip Only for Windows systems < $req"; } - ?> --FILE-- <?php @@ -21,5 +19,4 @@ var_dump(bcpowmod(1, 1.2, 1, 1)); ?> --EXPECTF-- string(1) "1" -string(3) "0.0" -bc math warning: non-zero scale in exponent +%Astring(3) "0.0"%A diff --git a/ext/bcmath/tests/bug75178-win32.phpt b/ext/bcmath/tests/bug75178-win32.phpt index bddb8e236f..9d71434f6c 100644 --- a/ext/bcmath/tests/bug75178-win32.phpt +++ b/ext/bcmath/tests/bug75178-win32.phpt @@ -18,9 +18,7 @@ var_dump(bcpowmod('4.1', '4', '3', 3)); var_dump(bcpowmod('4', '4', '3.1', 3)); ?> ===DONE=== ---EXPECT-- -string(5) "1.000" -string(5) "1.000" -===DONE=== -bc math warning: non-zero scale in base -bc math warning: non-zero scale in modulus +--EXPECTF-- +%Astring(5) "1.000" +%Astring(5) "1.000" +===DONE===%A |