From 27bf5fe76e6b7eba9617e2a1119ef4f34580b134 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 22 Mar 2019 15:10:59 +0100
Subject: [PATCH] tests: pecl/event needs ext/socket by default

---
 .travis.yml                | 22 +++++++++++++---------
 scripts/gen_travis_yml.php | 13 ++++++++++---
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8f19d08..e675264 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,13 +28,13 @@ env:
  - PHP=7.2 enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes
  - PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes
  - PHP=7.3 with_http_libicu_dir=no with_http_libidn_dir=no with_http_libidn2_dir=no with_http_libcurl_dir=no with_http_libevent_dir=no with_http_libbrotli_dir=no
- - PHP=7.3 PECL_EVENT=yes enable_debug=no enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes
- - PHP=7.3 PECL_EVENT=yes enable_debug=yes enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes
- - PHP=7.3 PECL_EVENT=yes enable_debug=no enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes
- - PHP=7.3 PECL_EVENT=yes enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes
- - CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage' PHP=7.3 enable_json=yes enable_hash=yes enable_iconv=yes with_http_libicu_dir=yes with_http_libidn_dir=no with_http_libidn2_dir=no 
- - CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage' PHP=7.3 enable_json=yes enable_hash=yes enable_iconv=yes with_http_libidn_dir=yes with_http_libicu_dir=no with_http_libidn2_dir=no 
- - CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage' PHP=7.3 enable_json=yes enable_hash=yes enable_iconv=yes with_http_libidn2_dir=yes with_http_libicu_dir=no with_http_libidn_dir=no 
+ - PHP=7.3 PECLs=event enable_sockets=yes enable_debug=no enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes
+ - PHP=7.3 PECLs=event enable_sockets=yes enable_debug=yes enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes
+ - PHP=7.3 PECLs=event enable_sockets=yes enable_debug=no enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes
+ - PHP=7.3 PECLs=event enable_sockets=yes enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes
+ - CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage' PHP=7.3 PECLs=event enable_sockets=yes enable_json=yes enable_hash=yes enable_iconv=yes with_http_libicu_dir=yes with_http_libidn_dir=no with_http_libidn2_dir=no 
+ - CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage' PHP=7.3 PECLs=event enable_sockets=yes enable_json=yes enable_hash=yes enable_iconv=yes with_http_libidn_dir=yes with_http_libicu_dir=no with_http_libidn2_dir=no 
+ - CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage' PHP=7.3 PECLs=event enable_sockets=yes enable_json=yes enable_hash=yes enable_iconv=yes with_http_libidn2_dir=yes with_http_libicu_dir=no with_http_libidn_dir=no 
 
 matrix:
  fast_finish: true
@@ -52,8 +52,12 @@ install:
  - make -f travis/pecl/Makefile pecl PECL=ext-raphf.git:raphf:master
  - make -f travis/pecl/Makefile pecl PECL=ext-propro.git:propro:master
  - |
-   if test "$PECL_EVENT" = "yes"; then \
-     make -f travis/pecl/Makefile pecl PECL=event; \
+   if test -n "$PECLs"; then \
+     IFS=$','; \
+     for pecl in $PECLs; do \
+       make -f travis/pecl/Makefile pecl PECL=$pecl; \
+     done; \
+     unset IFS; \
    fi
 
 script:
diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index 0549996..2cad77a 100755
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -48,7 +48,8 @@ $env = $gen([
 ], [
 // everything enabled for current, switching debug/zts
 	"PHP" => $cur,
-	"PECL_EVENT" => "yes",
+	"PECLs" => "event",			// for tests/client029.phpt
+	"enable_sockets" => "yes",	// needed by pecl/event
 	"enable_debug",
 	"enable_maintainer_zts",
 	"enable_json" => "yes",
@@ -59,6 +60,8 @@ $env = $gen([
 	"CFLAGS" => "'-O0 -g --coverage'",
 	"CXXFLAGS" => "'-O0 -g --coverage'",
 	"PHP" => $cur,
+	"PECLs" => "event",			// for tests/client029.phpt
+	"enable_sockets" => "yes",	// needed by pecl/event
 	"enable_json" => "yes",
 	"enable_hash" => "yes",
 	"enable_iconv" => "yes",
@@ -98,8 +101,12 @@ install:
  - make -f travis/pecl/Makefile pecl PECL=ext-raphf.git:raphf:master
  - make -f travis/pecl/Makefile pecl PECL=ext-propro.git:propro:master
  - |
-   if test "$PECL_EVENT" = "yes"; then \
-     make -f travis/pecl/Makefile pecl PECL=event; \
+   if test -n "$PECLs"; then \
+     IFS=$','; \
+     for pecl in $PECLs; do \
+       make -f travis/pecl/Makefile pecl PECL=$pecl; \
+     done; \
+     unset IFS; \
    fi
 
 script:
-- 
2.30.2