Skip to content

Commit ff1e07c

Browse files
committed
Fix mysql tests on Cirrus ASAN
We used localhost instead of 127.0.0.1, so the tests were never actually run. Closes GH-10802
1 parent a141543 commit ff1e07c

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.cirrus.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ asan_task:
77
image: gcc:latest
88
additional_containers:
99
- name: mysql
10-
image: mysql:latest
10+
image: mysql:8
1111
port: 3306
12+
cpu: 1.0
13+
memory: 1G
1214
env:
1315
MYSQL_ROOT_PASSWORD: "root"
1416
MYSQL_DATABASE: "test"
@@ -160,10 +162,10 @@ asan_task:
160162
tests_script:
161163
- export SKIP_IO_CAPTURE_TESTS=1
162164
- export CI_NO_IPV6=1
163-
- export MYSQL_TEST_HOST=mysql
165+
- export MYSQL_TEST_HOST=127.0.0.1
164166
- export MYSQL_TEST_USER=root
165167
- export MYSQL_TEST_PASSWD=root
166-
- export PDO_MYSQL_TEST_DSN="mysql:host=mysql;dbname=test"
168+
- export PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=test"
167169
- export PDO_MYSQL_TEST_USER=root
168170
- export PDO_MYSQL_TEST_PASS=root
169171
- >-

ext/pdo_mysql/tests/pdo_mysql___construct.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ pdo_mysql
66
<?php
77
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
88
MySQLPDOTest::skip();
9+
if (getenv('CIRRUS_CI')) die('xfail Broken on Cirrus+ARM');
910
?>
1011
--FILE--
1112
<?php

0 commit comments

Comments
 (0)