Test debug mode with a common function

Qihoo360 · Mar 13, 2017 · 65ffe37 · 65ffe37
1 parent 1ba81d7
commit 65ffe37
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/extension/tests/skipif.inc b/extension/tests/skipif.inc
@@ -6,7 +6,9 @@ function skip($text)
 
 function require_debug_mode()
 {
-    if (!function_exists('trace_start') || !function_exists('trace_end')) {
+    if (!function_exists('trace_start') ||
+            !function_exists('trace_end') ||
+            !function_exists('trace_set_filter')) {
         skip('Debug mode is required');
     }
 }
@@ -34,10 +36,3 @@ function for_verion_lt($version)
         skip('Required version < '.$version);
     }
 }
-
-function require_trace_filter()
-{
-    if (!function_exists('trace_set_filter')) {
-        skip("skip trace_set_filter() not exists");
-    }
-}
diff --git a/extension/tests/trace_015.phpt b/extension/tests/trace_015.phpt
@@ -6,7 +6,6 @@ trace.enable=1
 <?php
 require 'skipif.inc';
 require_debug_mode();
-require_trace_filter();
 ?>
 --FILE--
 <?php

diff --git a/extension/tests/trace_016.phpt b/extension/tests/trace_016.phpt
@@ -6,7 +6,6 @@ trace.enable=1
 <?php
 require 'skipif.inc';
 require_debug_mode();
-require_trace_filter();
 ?>
 --FILE--
 <?php
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ trace.enable=1 @@
     <?php
     require 'skipif.inc';
     require_debug_mode();
-    require_trace_filter();
     ?>
     --FILE--
     <?php
@@ Expand Down @@