diff options
| -rw-r--r-- | azure/i386/job.yml | 3 | ||||
| -rw-r--r-- | azure/install.yml | 1 | ||||
| -rw-r--r-- | azure/job.yml | 2 | ||||
| -rw-r--r-- | azure/msan_job.yml | 1 | ||||
| -rw-r--r-- | ext/standard/tests/file/bug52820.phpt | 12 |
5 files changed, 13 insertions, 6 deletions
diff --git a/azure/i386/job.yml b/azure/i386/job.yml index 354d213aa4..8d14bf2d91 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,8 @@ jobs: echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini 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/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 d6e837da6b..d1045d097e 100644 --- a/azure/job.yml +++ b/azure/job.yml @@ -18,6 +18,8 @@ jobs: displayName: 'Make Build' - 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 73a67509c8..3c58fa7c7a 100644 --- a/azure/msan_job.yml +++ b/azure/msan_job.yml @@ -63,6 +63,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 diff --git a/ext/standard/tests/file/bug52820.phpt b/ext/standard/tests/file/bug52820.phpt index b5690484a2..ea3089ea8c 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. |