- Opss, reverted accidental changes

9 files changed, 55 insertions, 0 deletions

diff --git a/ext/pcre/tests/007.phpt b/ext/pcre/tests/007.phpt
index 97d4633a12..776bec27b2 100644
--- a/ext/pcre/tests/007.phpt
+++ b/ext/pcre/tests/007.phpt
@@ -1,5 +1,11 @@
 --TEST--
 preg_replace_callback() with callback that modifies subject string
+--SKIPIF--
+<?php
+if (@preg_match('/./u', '') === false) {
+	die('skip no utf8 support in PCRE library');
+}
+?>
 --FILE--
 <?php
 
diff --git a/ext/pcre/tests/backtrack_limit.phpt b/ext/pcre/tests/backtrack_limit.phpt
index ebfd720c3c..517e727016 100644
--- a/ext/pcre/tests/backtrack_limit.phpt
+++ b/ext/pcre/tests/backtrack_limit.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Backtracking limit
+--SKIPIF--
+<?php
+if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) {
+	die("skip no support for \p support PCRE library");
+}
+?>
 --INI--
 pcre.backtrack_limit=2
 --FILE--
diff --git a/ext/pcre/tests/bug27103.phpt b/ext/pcre/tests/bug27103.phpt
index 185225d310..163dc9f1ea 100644
--- a/ext/pcre/tests/bug27103.phpt
+++ b/ext/pcre/tests/bug27103.phpt
@@ -1,5 +1,11 @@
 --TEST--
 Bug #27103 (preg_split('//u') incorrectly splits UTF-8 strings into octets)
+--SKIPIF--
+<?php
+if (@preg_match('/./u', '') === false) {
+	die('skip no utf8 support in PCRE library');
+}
+?>
 --FILE--
 <?php
 function iter($ar)
diff --git a/ext/pcre/tests/invalid_utf8.phpt b/ext/pcre/tests/invalid_utf8.phpt
index df2de2da9b..56bad834dc 100644
--- a/ext/pcre/tests/invalid_utf8.phpt
+++ b/ext/pcre/tests/invalid_utf8.phpt
@@ -1,5 +1,11 @@
 --TEST--
 preg_replace() and invalid UTF8
+--SKIPIF--
+<?php
+if (@preg_match('/./u', '') === false) {
+	die('skip no utf8 support in PCRE library');
+}
+?>
 --FILE--
 <?php
 
diff --git a/ext/pcre/tests/invalid_utf8_offset.phpt b/ext/pcre/tests/invalid_utf8_offset.phpt
index 30fe7029da..4e0d40caf4 100644
--- a/ext/pcre/tests/invalid_utf8_offset.phpt
+++ b/ext/pcre/tests/invalid_utf8_offset.phpt
@@ -1,5 +1,11 @@
 --TEST--
 preg_replace() and invalid UTF8 offset
+--SKIPIF--
+<?php
+if (@preg_match('/./u', '') === false) {
+	die('skip no utf8 support in PCRE library');
+}
+?>
 --FILE--
 <?php
 
diff --git a/ext/pcre/tests/locales.phpt b/ext/pcre/tests/locales.phpt
index 647c0d8f7e..a1030204ee 100644
--- a/ext/pcre/tests/locales.phpt
+++ b/ext/pcre/tests/locales.phpt
@@ -1,5 +1,12 @@
 --TEST--
 Localized match
+--SKIPIF--
+<?php 
+
+if (!function_exists('setlocale')) die('skip: setlocale() not available');
+if (!@setlocale(LC_ALL, 'pt_PT', 'pt', 'pt_PT.ISO8859-1', 'portuguese')) die('skip pt locale not available');
+
+?>
 --FILE--
 <?php
 
diff --git a/ext/pcre/tests/pcre_anchored.phpt b/ext/pcre/tests/pcre_anchored.phpt
index caa96437e1..a609fdbdcd 100644
--- a/ext/pcre/tests/pcre_anchored.phpt
+++ b/ext/pcre/tests/pcre_anchored.phpt
@@ -1,5 +1,11 @@
 --TEST--
 A (PCRE_ANCHORED) modififer
+--SKIPIF--
+<?php
+if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) {
+	die("skip no support for \p support PCRE library");
+}
+?>
 --FILE--
 <?php
 
diff --git a/ext/pcre/tests/preg_replace2.phpt b/ext/pcre/tests/preg_replace2.phpt
index 4e2f39f8ca..4a191f3331 100644
--- a/ext/pcre/tests/preg_replace2.phpt
+++ b/ext/pcre/tests/preg_replace2.phpt
@@ -1,5 +1,11 @@
 --TEST--
 preg_replace()
+--SKIPIF--
+<?php
+if (@preg_match('/./u', '') === false) {
+	die('skip no utf8 support in PCRE library');
+}
+?>
 --FILE--
 <?php
 
diff --git a/ext/pcre/tests/recursion_limit.phpt b/ext/pcre/tests/recursion_limit.phpt
index 2a43aa27d6..9933b5c4d7 100644
--- a/ext/pcre/tests/recursion_limit.phpt
+++ b/ext/pcre/tests/recursion_limit.phpt
@@ -1,5 +1,11 @@
 --TEST--
 PCRE Recursion limit
+--SKIPIF--
+<?php
+if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) {
+	die("skip no support for \p support PCRE library");
+}
+?>
 --INI--
 pcre.recursion_limit=2
 --FILE--