From 372331fc6dc17748b426e213f29811e5910ed6c9 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 18 Mar 2020 10:11:15 +0100
Subject: Use "set -e" in some pipeline steps

---
 azure/i386/job.yml | 2 ++
 azure/install.yml  | 1 +
 azure/job.yml      | 1 +
 3 files changed, 4 insertions(+)

diff --git a/azure/i386/job.yml b/azure/i386/job.yml
index 2b1e9847af..65a7e5702c 100644
--- a/azure/i386/job.yml
+++ b/azure/i386/job.yml
@@ -70,6 +70,7 @@ jobs:
     - script: make -j$(/usr/bin/nproc) >/dev/null
       displayName: 'Make Build'
     - script: |
+        set -e
         sudo make install
         sudo mkdir     /etc/php.d
         sudo chmod 777 /etc/php.d
@@ -79,6 +80,7 @@ jobs:
         echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
       displayName: 'Install Build'
     - script: |
+        set -e
         mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
         sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
         sudo -u postgres psql -c "CREATE DATABASE test;"
diff --git a/azure/install.yml b/azure/install.yml
index 7f5bf4b68f..3cd6122071 100644
--- a/azure/install.yml
+++ b/azure/install.yml
@@ -1,5 +1,6 @@
 steps:
   - script: |
+      set -e
       sudo make install
       sudo mkdir     /etc/php.d
       sudo chmod 777 /etc/php.d
diff --git a/azure/job.yml b/azure/job.yml
index 918c107118..020f69c13c 100644
--- a/azure/job.yml
+++ b/azure/job.yml
@@ -18,6 +18,7 @@ jobs:
       displayName: 'Make Build'
     - template: install.yml
     - script: |
+        set -e
         mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
         sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
         sudo -u postgres psql -c "CREATE DATABASE test;"
-- 
cgit v1.2.1


From bf382a3cb600541b199f48b16c98b2b1c58bf5e8 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 18 Mar 2020 10:15:05 +0100
Subject: Explicitly start mysql

---
 azure/i386/job.yml | 1 +
 azure/job.yml      | 1 +
 azure/msan_job.yml | 1 +
 3 files changed, 3 insertions(+)

diff --git a/azure/i386/job.yml b/azure/i386/job.yml
index 65a7e5702c..5ada61b415 100644
--- a/azure/i386/job.yml
+++ b/azure/i386/job.yml
@@ -81,6 +81,7 @@ jobs:
       displayName: 'Install Build'
     - script: |
         set -e
+        sudo service mysql start
         mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
         sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
         sudo -u postgres psql -c "CREATE DATABASE test;"
diff --git a/azure/job.yml b/azure/job.yml
index 020f69c13c..80ffb35e86 100644
--- a/azure/job.yml
+++ b/azure/job.yml
@@ -19,6 +19,7 @@ jobs:
     - template: install.yml
     - script: |
         set -e
+        sudo service mysql start
         mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
         sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
         sudo -u postgres psql -c "CREATE DATABASE test;"
diff --git a/azure/msan_job.yml b/azure/msan_job.yml
index c623f55d36..724aed9ca3 100644
--- a/azure/msan_job.yml
+++ b/azure/msan_job.yml
@@ -62,6 +62,7 @@ jobs:
         echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock  > /etc/php.d/pdo_mysql.ini
       displayName: 'Install Build'
     - script: |
+        sudo service mysql start
         mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
       displayName: 'Setup'
     - template: test.yml
-- 
cgit v1.2.1


From ba6834fa574495d0f31be10b74bd7cfd4ef054e5 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 18 Mar 2020 10:25:38 +0100
Subject: Make bug52820.phpt more robust

Use a more robust error condition...
---
 ext/standard/tests/file/bug52820.phpt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ext/standard/tests/file/bug52820.phpt b/ext/standard/tests/file/bug52820.phpt
index e51c27e457..cdf4db3e5a 100644
--- a/ext/standard/tests/file/bug52820.phpt
+++ b/ext/standard/tests/file/bug52820.phpt
@@ -7,7 +7,7 @@ if (!function_exists('zend_leak_variable'))
 /* unfortunately no standard function does a cast to FILE*, so we need
  * curl to test this */
 if (!extension_loaded("curl")) exit("skip curl extension not loaded");
-$handle=curl_init('http://127.0.0.1:37349/');
+$handle=curl_init('file:///i_dont_exist/');
 curl_setopt($handle, CURLOPT_VERBOSE, true);
 curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
 if (!curl_setopt($handle, CURLOPT_STDERR, fopen("php://memory", "w+")))
@@ -15,7 +15,7 @@ if (!curl_setopt($handle, CURLOPT_STDERR, fopen("php://memory", "w+")))
 --FILE--
 <?php
 function do_stuff($url) {
-    $handle=curl_init('http://127.0.0.1:37349/');
+    $handle=curl_init('file:///i_dont_exist/');
     curl_setopt($handle, CURLOPT_VERBOSE, true);
     curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
     curl_setopt($handle, CURLOPT_STDERR, $o = fopen($url, "w+"));
@@ -42,22 +42,22 @@ echo "\nDone.\n";
 --EXPECTF--
 temp stream (close after):
 About to rewind!
-* %ATrying 127.0.0.1...%AConnection refused%A
+* Couldn't open file /i_dont_exist/
 * Closing connection%A%d
 
 memory stream (close after):
 About to rewind!
-* %ATrying 127.0.0.1...%AConnection refused%A
+* Couldn't open file /i_dont_exist/
 * Closing connection%A%d
 
 temp stream (leak):
 About to rewind!
-* %ATrying 127.0.0.1...%AConnection refused%A
+* Couldn't open file /i_dont_exist/
 * Closing connection%A%d
 
 memory stream (leak):
 About to rewind!
-* %ATrying 127.0.0.1...%AConnection refused%A
+* Couldn't open file /i_dont_exist/
 * Closing connection%A%d
 
 Done.
-- 
cgit v1.2.1