diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:37:27 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:37:27 -0400 |
| commit | 2d4e5b09576bb4f0ba716cc82cdf29ea04d9184b (patch) | |
| tree | 41ccc042009cba53e4ce43e727fcba4c1cfbf7f3 /tests/lang | |
| parent | d29a4fd2dd3b5d4cf6e80b602544d7b71d794e76 (diff) | |
| download | php-2d4e5b09576bb4f0ba716cc82cdf29ea04d9184b.tar.gz | |
Imported Upstream version 5.2.2upstream/5.2.2
Diffstat (limited to 'tests/lang')
| -rwxr-xr-x | tests/lang/bug24640.phpt | 42 | ||||
| -rwxr-xr-x | tests/lang/bug27439.phpt | 2 | ||||
| -rw-r--r-- | tests/lang/bug30638.phpt | 4 |
3 files changed, 25 insertions, 23 deletions
diff --git a/tests/lang/bug24640.phpt b/tests/lang/bug24640.phpt index eb208cf56..919b38e29 100755 --- a/tests/lang/bug24640.phpt +++ b/tests/lang/bug24640.phpt @@ -35,7 +35,7 @@ test(1.7e-1000); ?> ===DONE=== <?php exit(0); ?> ---EXPECT-- +--EXPECTF-- 1.7E+300 float(1.7E+300) 1.7E+300 @@ -76,50 +76,50 @@ float(1.7E-81) 1.7E-81 1.7E-81 ------ -INF -float(INF) -INF -INF +I%s +float(I%s) +I%s +I%s ------ 1.69998107421E-319 float(1.69998107421E-319) 1.69998107421E-319 1.69998107421E-319 ------ -INF -float(INF) -INF -INF +I%s +float(I%s) +I%s +I%s ------ 1.70007988734E-320 float(1.70007988734E-320) 1.70007988734E-320 1.70007988734E-320 ------ -INF -float(INF) -INF -INF +I%s +float(I%s) +I%s +I%s ------ 1.69958582169E-321 float(1.69958582169E-321) 1.69958582169E-321 1.69958582169E-321 ------ -INF -float(INF) -INF -INF +I%s +float(I%s) +I%s +I%s ------ 0 float(0) 0 0 ------ -INF -float(INF) -INF -INF +I%s +float(I%s) +I%s +I%s ------ 0 float(0) diff --git a/tests/lang/bug27439.phpt b/tests/lang/bug27439.phpt index 66798dc75..b12fd1ec6 100755 --- a/tests/lang/bug27439.phpt +++ b/tests/lang/bug27439.phpt @@ -65,6 +65,8 @@ echo "===DONE==="; ?>
--EXPECTF--
123
+Notice: Undefined property: test::$foobar in %s on line %d
+
Warning: Invalid argument supplied for foreach() in %s on line %d
Warning: Invalid argument supplied for foreach() in %s on line %d
diff --git a/tests/lang/bug30638.phpt b/tests/lang/bug30638.phpt index 2574d132d..0ebe8d49d 100644 --- a/tests/lang/bug30638.phpt +++ b/tests/lang/bug30638.phpt @@ -1,9 +1,9 @@ --TEST-- -Bug #30638 (localeconv returns wrong LC_NUMERIC settings) +Bug #30638 (localeconv returns wrong LC_NUMERIC settings) (ok to fail on MacOS X) --SKIPIF-- <?php # try to activate a german locale if (setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge") === FALSE) { - print "skip"; + print "skip setlocale() failed"; } ?> --FILE-- |