summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--412.patch41
-rw-r--r--php-pecl-datadog-trace.spec14
2 files changed, 51 insertions, 4 deletions
diff --git a/412.patch b/412.patch
new file mode 100644
index 0000000..b3718e4
--- /dev/null
+++ b/412.patch
@@ -0,0 +1,41 @@
+From 2f8102cac639f97f95c4c1412ee0d367ab9c2c50 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 26 Apr 2019 07:54:26 +0200
+Subject: [PATCH] simplify regex which fails with 7.3
+
+---
+ tests/ext/segfault_backtrace_enabled.phpt | 2 +-
+ tests/ext/segfault_backtrace_enabled_via_env.phpt | 2 +-
+ .../ext/segfault_backtrace_enabled_via_env_disabled_in_ini.phpt | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/ext/segfault_backtrace_enabled.phpt b/tests/ext/segfault_backtrace_enabled.phpt
+index 9aa2fe4b..b89f757c 100644
+--- a/tests/ext/segfault_backtrace_enabled.phpt
++++ b/tests/ext/segfault_backtrace_enabled.phpt
+@@ -17,4 +17,4 @@ Received Signal 11
+ Note: Backtrace below might be incomplete and have wrong entries due to optimized runtime
+ Backtrace:
+ .*ddtrace\.so.*ddtrace_backtrace_handler.*
+-[\S\W\D\R]*
++.*
+diff --git a/tests/ext/segfault_backtrace_enabled_via_env.phpt b/tests/ext/segfault_backtrace_enabled_via_env.phpt
+index f19a831e..a706195e 100644
+--- a/tests/ext/segfault_backtrace_enabled_via_env.phpt
++++ b/tests/ext/segfault_backtrace_enabled_via_env.phpt
+@@ -17,4 +17,4 @@ Received Signal 11
+ Note: Backtrace below might be incomplete and have wrong entries due to optimized runtime
+ Backtrace:
+ .*ddtrace\.so.*ddtrace_backtrace_handler.*
+-[\S\W\D\R]*
++.*
+diff --git a/tests/ext/segfault_backtrace_enabled_via_env_disabled_in_ini.phpt b/tests/ext/segfault_backtrace_enabled_via_env_disabled_in_ini.phpt
+index 4384382c..808b4000 100644
+--- a/tests/ext/segfault_backtrace_enabled_via_env_disabled_in_ini.phpt
++++ b/tests/ext/segfault_backtrace_enabled_via_env_disabled_in_ini.phpt
+@@ -19,4 +19,4 @@ Received Signal 11
+ Note: Backtrace below might be incomplete and have wrong entries due to optimized runtime
+ Backtrace:
+ .*ddtrace\.so.*ddtrace_backtrace_handler.*
+-[\S\W\D\R]*
++.*
diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec
index ebc8f4a..5e8153e 100644
--- a/php-pecl-datadog-trace.spec
+++ b/php-pecl-datadog-trace.spec
@@ -40,6 +40,8 @@ License: MIT
URL: http://pecl.php.net/package/%{proj_name}
Source0: http://pecl.php.net/get/%{proj_name}-%{version}.tgz
+Patch0: https://github.com/DataDog/dd-trace-php/pull/412.patch
+
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel
BuildRequires: %{?scl_prefix}php-pear
@@ -99,6 +101,8 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
+%patch0 -p1 -b .pr412
+
cp src/ext/mpack/LICENSE LICENSE.mpack
: Sanity check, really often broken
@@ -173,12 +177,12 @@ done
%check
%if "%{php_version}" < "7"
-rm ?TS/tests/ext/dd_trace_serialize_msgpack.phpt
-rm ?TS/tests/ext/dd_trace_serialize_msgpack_error.phpt
-rm ?TS/tests/ext/dd_trace_serialize_msgpack_error_strict.phpt
-%endif
+#rm ?TS/tests/ext/dd_trace_serialize_msgpack.phpt
+#rm ?TS/tests/ext/dd_trace_serialize_msgpack_error.phpt
+#rm ?TS/tests/ext/dd_trace_serialize_msgpack_error_strict.phpt
rm ?TS/tests/ext/segfault_backtrace_disabled_via_env_enabled_in_ini.phpt
rm ?TS/tests/ext/segfault_backtrace_disabled.phpt
+%endif
MOD="-n"
[ -f %{php_extdir}/json.so ] && MOD="$MOD -d extension=json.so"
@@ -248,6 +252,8 @@ fi
%changelog
* Fri Apr 26 2019 Remi Collet <remi@remirepo.net> - 0.20.0-1
- update to 0.20.0
+- add patch for test suite on 7.3 from
+ https://github.com/DataDog/dd-trace-php/pull/412
* Sun Apr 14 2019 Remi Collet <remi@remirepo.net> - 0.19.0-1
- update to 0.19.0