From: Hannes Magnusson <bjori@php.net>
Date: Tue, 19 Dec 2006 10:03:24 +0000 (+0000)
Subject: Fix tests
X-Git-Tag: php-5.2.1RC2~159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b12e3e14753882137f013aadfedd0f3ae7ae0bee;p=php

Fix tests
---

diff --git a/Zend/tests/bug34617.phpt b/Zend/tests/bug34617.phpt
index 23c43c4f9f..25f785f909 100755
--- a/Zend/tests/bug34617.phpt
+++ b/Zend/tests/bug34617.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #34617 (zend_deactivate: objects_store used after zend_objects_store_destroy is called) 
 --SKIPIF--
-<?php if (!extension_loaded("xml")) print "skip"; ?>
+<?php if (!extension_loaded("xml")) print "skip the xml extension not available"; ?>
 --FILE--
 <?php
 class Thing {}
@@ -15,4 +15,4 @@ function boom()
 boom();
 ?>
 --EXPECT--
-ok
\ No newline at end of file
+ok
diff --git a/ext/ftp/tests/004.phpt b/ext/ftp/tests/004.phpt
index 163d0b5752..df6951b091 100644
--- a/ext/ftp/tests/004.phpt
+++ b/ext/ftp/tests/004.phpt
@@ -56,7 +56,7 @@ NULL
 Warning: ftp_close() expects exactly 1 parameter, 0 given in %s004.php on line 17
 NULL
 
-Warning: ftp_connect(): php_network_getaddresses: getaddrinfo failed: %s not known in %s004.php on line 18
+Warning: ftp_connect(): php_network_getaddresses: getaddrinfo failed: %s in %s004.php on line 18
 bool(false)
 
 Warning: ftp_delete() expects parameter 2 to be string, array given in %s004.php on line 19
diff --git a/ext/standard/tests/array/locale_sort.phpt b/ext/standard/tests/array/locale_sort.phpt
index b4e15fa524..4b7068fa85 100644
--- a/ext/standard/tests/array/locale_sort.phpt
+++ b/ext/standard/tests/array/locale_sort.phpt
@@ -2,13 +2,13 @@
 Sort with SORT_LOCALE_STRING
 --SKIPIF--
 <?php
-if ("fr_FR" != setlocale(LC_CTYPE, "fr_FR")) {
+if (false == setlocale(LC_CTYPE, "fr_FR", "fr_FR.ISO8859-1")) {
   die("skip setlocale() failed\n");
 }
 ?>
 --FILE--
 <?php
-setlocale(LC_ALL, 'fr_FR');
+setlocale(LC_ALL, 'fr_FR', 'fr_FR.ISO8859-1');
 $table = array("AB" => "Alberta",
 "BC" => "Colombie-Britannique",
 "MB" => "Manitoba",
diff --git a/tests/lang/bug30638.phpt b/tests/lang/bug30638.phpt
index 2574d132d3..9edc177320 100644
--- a/tests/lang/bug30638.phpt
+++ b/tests/lang/bug30638.phpt
@@ -3,7 +3,7 @@ Bug #30638 (localeconv returns wrong LC_NUMERIC settings)
 --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--