From: andy wharmby <wharmby@php.net>
Date: Fri, 23 Jan 2009 20:23:25 +0000 (+0000)
Subject: Fix tests. Add missing SKIPIF. Tested on Windows, Linux and Linux 64
X-Git-Tag: php-5.2.9RC1~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7861cec3efa2346f835d3ec9cacab1f1cbabc788;p=php

Fix tests. Add missing SKIPIF. Tested on Windows, Linux and Linux 64
---

diff --git a/ext/json/tests/001.phpt b/ext/json/tests/001.phpt
index fc687f28ca..e227e978eb 100644
--- a/ext/json/tests/001.phpt
+++ b/ext/json/tests/001.phpt
@@ -24,8 +24,8 @@ var_dump(json_decode('{ "": { "": "" } }'));
 var_dump(json_decode('{ "": { "": "" }'));
 var_dump(json_decode('{ "": "": "" } }'));
 
-echo "Done\n";
 ?>
+===DONE===
 --EXPECTF--
 Warning: json_decode() expects at least 1 parameter, 0 given in %s on line %d
 NULL
@@ -40,34 +40,34 @@ string(12) "руссиш"
 string(4) "blah"
 NULL
 NULL
-object(stdClass)#1 (1) {
+object(stdClass)#%d (1) {
   ["test"]=>
-  object(stdClass)#2 (1) {
+  object(stdClass)#%d (1) {
     ["foo"]=>
     string(3) "bar"
   }
 }
-object(stdClass)#1 (1) {
+object(stdClass)#%d (1) {
   ["test"]=>
-  object(stdClass)#2 (1) {
+  object(stdClass)#%d (1) {
     ["foo"]=>
     string(0) ""
   }
 }
-object(stdClass)#1 (1) {
+object(stdClass)#%d (1) {
   ["_empty_"]=>
-  object(stdClass)#2 (1) {
+  object(stdClass)#%d (1) {
     ["foo"]=>
     string(0) ""
   }
 }
-object(stdClass)#1 (1) {
+object(stdClass)#%d (1) {
   ["_empty_"]=>
-  object(stdClass)#2 (1) {
+  object(stdClass)#%d (1) {
     ["_empty_"]=>
     string(0) ""
   }
 }
 NULL
 NULL
-Done
+===DONE===
diff --git a/ext/json/tests/bug46215.phpt b/ext/json/tests/bug46215.phpt
index da3344fec0..0ac460cc15 100644
--- a/ext/json/tests/bug46215.phpt
+++ b/ext/json/tests/bug46215.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Bug #46215 (json_encode mutates its parameter and has some class-specific state)
+--SKIPIF--
+<?php
+if (!extension_loaded("json")) {
+ 	die('skip JSON extension not available in this build');
+}	 
+?>
 --FILE--
 <?php