From 1970c23d86e8c6a37281aa3162430fb68a6cc7a6 Mon Sep 17 00:00:00 2001
From: Christopher Jones <sixd@php.net>
Date: Fri, 5 Aug 2011 22:18:50 +0000
Subject: [PATCH] Improve test portabilty

---
 ext/oci8/tests/bug37220.phpt   |  2 +-
 ext/oci8/tests/xmltype_02.phpt | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ext/oci8/tests/bug37220.phpt b/ext/oci8/tests/bug37220.phpt
index 8d59644b8e..fd91dc73d6 100644
--- a/ext/oci8/tests/bug37220.phpt
+++ b/ext/oci8/tests/bug37220.phpt
@@ -43,7 +43,7 @@ oci_execute($stmt);
 
 while ($row = oci_fetch_array($stmt, OCI_ASSOC+OCI_RETURN_NULLS)) {
 	foreach ($row as $item) {
-		echo $item."\n";
+		echo trim($item)."\n";
 	}
 	echo "\n";
 }
diff --git a/ext/oci8/tests/xmltype_02.phpt b/ext/oci8/tests/xmltype_02.phpt
index 5ac294102e..28e9401baf 100644
--- a/ext/oci8/tests/xmltype_02.phpt
+++ b/ext/oci8/tests/xmltype_02.phpt
@@ -164,18 +164,18 @@ object(SimpleXMLElement)#%d (10) {
   string(2) "10"
 }
 Test 3: Update changes using a temporary CLOB
-string(331) "<?xml version="1.0"?>
+string(%d) "<?xml version="1.0"?>
 <Warehouse>
-<WarehouseId>1</WarehouseId>
-<WarehouseName>Southlake, Texas</WarehouseName>
-<Building>Owned</Building>
-<Area>25000</Area>
-<Docks>1</Docks>
-<DockType>Rear load</DockType>
-<WaterAccess>true</WaterAccess>
-<RailAccess>N</RailAccess>
-<Parking>Street</Parking>
-<VClearance>10</VClearance>
+%sWarehouseId>1</WarehouseId>
+%sWarehouseName>Southlake, Texas</WarehouseName>
+%sBuilding>Owned</Building>
+%sArea>25000</Area>
+%sDocks>1</Docks>
+%sDockType>Rear load</DockType>
+%sWaterAccess>true</WaterAccess>
+%sRailAccess>N</RailAccess>
+%sParking>Street</Parking>
+%sVClearance>10</VClearance>
 </Warehouse>
 "
 ===DONE===
\ No newline at end of file
-- 
2.40.0