rpms/php-pecl-xdebug3
6
0
Fork 0
Code Issues Pull Requests Releases Activity

add upstream patch for test suite

Browse Source
This commit is contained in:
Remi Collet 2023-12-11 16:33:37 +01:00
parent 553bdf5f52
commit 6676bb7c38
2 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
php-pecl-xdebug3.spec
View File

@ -29,9 +29,11 @@
Name: php-pecl-xdebug3
Summary: Provides functions for function traces and profiling
Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
Release: 1%{?dist}
Release: 2%{?dist}
Source0: https://github.com/%{pecl_name}/%{pecl_name}/archive/%{gh_commit}/%{pecl_name}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tar.gz
Patch0: upstream.patch
License: Xdebug-1.03
URL: https://xdebug.org/
@ -87,6 +89,8 @@ mv %{sources}/package.xml .
sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml
cd %{sources}
%patch -P0 -p1
# Check extension version
ver=$(sed -n '/XDEBUG_VERSION/{s/.* "//;s/".*$//;p}' php_xdebug.h)
if test "$ver" != "%{upstream_version}%{?upstream_prever}%{?gh_date:-dev}"; then
@ -205,9 +209,6 @@ cd %{sources}
rm tests/base/bug02036.phpt
# Erratic result
rm tests/debugger/bug00998-ipv6.phpt
# see https://bugs.xdebug.org/view.php?id=2220
rm tests/debugger/bug01388-08.phpt
rm tests/debugger/bug02006-001.phpt
# bug00886 is marked as slow as it uses a lot of disk space
TEST_OPTS="-q -x --show-diff"
@ -236,6 +237,9 @@ REPORT_EXIT_STATUS=1 \
%changelog
* Mon Dec 11 2023 Remi Collet <remi@remirepo.net> - 3.3.0-2
- add upstream patch for test suite
* Fri Dec 1 2023 Remi Collet <remi@remirepo.net> - 3.3.0-1
- update to 3.3.0

40
upstream.patch Normal file
View File

@ -0,0 +1,40 @@
From adff1261e4fd3baf6e819e342f08fbe5c84c8d4d Mon Sep 17 00:00:00 2001
From: Derick Rethans <github@derickrethans.nl>
Date: Mon, 11 Dec 2023 14:56:50 +0000
Subject: [PATCH] Fixed test robustness
---
tests/debugger/bug01388-08.phpt | 4 ++--
tests/debugger/bug02006-001.phpt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/debugger/bug01388-08.phpt b/tests/debugger/bug01388-08.phpt
index e37fa6369..df1fec064 100644
--- a/tests/debugger/bug01388-08.phpt
+++ b/tests/debugger/bug01388-08.phpt
@@ -50,10 +50,10 @@ dbgpRunFile( $filename, $commands );
-> run -i 6
<?xml version="1.0" encoding="iso-8859-1"?>
-<notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="breakpoint_resolved"><breakpoint type="line" resolved="resolved" filename="file://bug01388-08b.inc" lineno="2" state="enabled" hit_count="0" hit_value="0" id="{{PID}}0001"></breakpoint></notify>
+<notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="breakpoint_resolved"><breakpoint type="line" resolved="resolved" filename="file://bug01388-08b.inc" lineno="%r(2|9)%r" state="enabled" hit_count="0" hit_value="0" id="{{PID}}000%r(1|2)%r"></breakpoint></notify>
<?xml version="1.0" encoding="iso-8859-1"?>
-<notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="breakpoint_resolved"><breakpoint type="line" resolved="resolved" filename="file://bug01388-08b.inc" lineno="9" state="enabled" hit_count="0" hit_value="0" id="{{PID}}0002"></breakpoint></notify>
+<notify xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" name="breakpoint_resolved"><breakpoint type="line" resolved="resolved" filename="file://bug01388-08b.inc" lineno="%r(2|9)%r" state="enabled" hit_count="0" hit_value="0" id="{{PID}}000%r(1|2)%r"></breakpoint></notify>
<?xml version="1.0" encoding="iso-8859-1"?>
<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="run" transaction_id="6" status="break" reason="ok"><xdebug:message filename="file://bug01388-08b.inc" lineno="2"></xdebug:message></response>
diff --git a/tests/debugger/bug02006-001.phpt b/tests/debugger/bug02006-001.phpt
index 908480701..b52218bff 100644
--- a/tests/debugger/bug02006-001.phpt
+++ b/tests/debugger/bug02006-001.phpt
@@ -35,7 +35,7 @@ dbgpRunFile( $filename, $commands );
-> breakpoint_list -i 3
<?xml version="1.0" encoding="iso-8859-1"?>
-<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="breakpoint_list" transaction_id="3"><breakpoint type="call" function="a" state="enabled" hit_count="0" hit_value="0" id="{{PID}}0001"></breakpoint><breakpoint type="call" function="b" state="enabled" hit_count="0" hit_value="0" id="{{PID}}0002"></breakpoint></response>
+<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="breakpoint_list" transaction_id="3"><breakpoint type="call" function="%r(a|b)%r" state="enabled" hit_count="0" hit_value="0" id="{{PID}}000%r(1|2)%r"></breakpoint><breakpoint type="call" function="%r(a|b)%r" state="enabled" hit_count="0" hit_value="0" id="{{PID}}000%r(1|2)%r"></breakpoint></response>
-> breakpoint_remove -i 4 -d %d0001
<?xml version="1.0" encoding="iso-8859-1"?>