[packages/php-pecl-memcache/dev-4.0.3] Add memcache with udp listen for tests
glen
glen at pld-linux.org
Fri Oct 4 12:43:54 CEST 2019
commit cb9f58e6f5436cdd2ecdc3caea0985c162620373
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Wed Aug 21 12:15:24 2019 +0300
Add memcache with udp listen for tests
php-pecl-memcache.spec | 6 +++++-
tests.patch | 12 ++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index eae6690..86faccd 100644
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -21,6 +21,7 @@ Source2: %{modname}-apache.conf
Source3: %{modname}-lighttpd.conf
Source4: config.php
Patch0: %{modname}-webapp.patch
+Patch1: tests.patch
URL: https://github.com/websupport-sk/pecl-memcache/
BuildRequires: %{php_name}-devel >= 3:7.0.0
BuildRequires: %{php_name}-pcre
@@ -91,6 +92,7 @@ memcache.
%setup -qc
mv pecl-%{modname}-*/{.??*,*} .
%patch0 -p1
+%patch1 -p1
cat <<'EOF' > run-tests.sh
#!/bin/sh
@@ -172,8 +174,10 @@ grep %{modname} modules.log
%if %{with tests}
# Launch the Memcached service and stop it on exit
+domainsocket=$PWD/memcached.sock
%{_sbindir}/memcached -p 11211 -U 11211 -d -P $PWD/memcached.pid
-trap 'kill $(cat memcached.pid)' EXIT INT
+%{_sbindir}/memcached -s $domainsocket -d -P $PWD/memcached-udp.pid
+trap 'kill $(cat memcached.pid memcached-udp.pid)' EXIT INT
./run-tests.sh --show-diff
%endif
diff --git a/tests.patch b/tests.patch
new file mode 100644
index 0000000..ba6fbbb
--- /dev/null
+++ b/tests.patch
@@ -0,0 +1,12 @@
+--- php73-pecl-memcache-4.0.4/tests/connect.inc~ 2019-05-28 11:55:34.000000000 +0300
++++ php73-pecl-memcache-4.0.4/tests/connect.inc 2019-08-20 17:25:17.729668632 +0300
+@@ -34,7 +34,8 @@
+ * memcached -d -u memcached -s /var/run/memcached/memcached.sock
+ * chmod a+w /var/run/memcached/memcached.sock
+ */
+-$domainsocket = 'unix:///var/run/memcached/memcached.sock';
++$cwd = getcwd();
++$domainsocket = "unix://{$cwd}/memcached.sock";
+
+ // A server which is guaranteed to fail immediatly
+ $nonExistingHost = "localhost";
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcache.git/commitdiff/cb9f58e6f5436cdd2ecdc3caea0985c162620373
More information about the pld-cvs-commit
mailing list