diff options
Diffstat (limited to 'azure/i386')
-rw-r--r-- | azure/i386/job.yml | 18 | ||||
-rw-r--r-- | azure/i386/test.yml | 33 |
2 files changed, 8 insertions, 43 deletions
diff --git a/azure/i386/job.yml b/azure/i386/job.yml index 83e8705f0f..aa70b39f9b 100644 --- a/azure/i386/job.yml +++ b/azure/i386/job.yml @@ -1,17 +1,19 @@ parameters: configurationName: '' configurationParameters: '' + timeoutInMinutes: 75 jobs: - job: ${{ parameters.configurationName }} + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} pool: - vmImage: 'ubuntu-18.04' + vmImage: 'ubuntu-20.04' steps: - template: apt.yml - script: | ./buildconf --force - export CFLAGS=-m32 - export CXXFLAGS=-m32 + export CFLAGS="-m32 -msse2" + export CXXFLAGS="-m32 -msse2" export LDFLAGS=-L/usr/lib/i386-linux-gnu export PKG_CONFIG=/usr/bin/i686-linux-gnu-pkg-config ./configure ${{ parameters.configurationParameters }} \ @@ -39,7 +41,6 @@ jobs: --enable-xmlreader \ --with-xsl \ --with-tidy \ - --with-xmlrpc \ --enable-sysvsem \ --enable-sysvshm \ --enable-shmop \ @@ -63,6 +64,7 @@ jobs: --enable-zend-test \ --with-mhash \ --with-sodium \ + --enable-dba \ --enable-werror \ --with-config-file-path=/etc \ --with-config-file-scan-dir=/etc/php.d @@ -86,11 +88,7 @@ jobs: #sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';" #sudo -u postgres psql -c "CREATE DATABASE test;" displayName: 'Setup' - - template: test.yml + - template: ../tests.yml parameters: configurationName: ${{ parameters.configurationName }} - - template: test.yml - parameters: - configurationName: ${{ parameters.configurationName }} - runTestsName: 'OpCache' - runTestsParameters: -d zend_extension=opcache.so + runTestsParameters: ${{ parameters.runTestsParameters }} diff --git a/azure/i386/test.yml b/azure/i386/test.yml deleted file mode 100644 index 1e2e1d6a1e..0000000000 --- a/azure/i386/test.yml +++ /dev/null @@ -1,33 +0,0 @@ -parameters: - runTestsName: '' - runTestsParameters: '' - -steps: - - script: | - export MYSQL_TEST_USER=root - export MYSQL_TEST_PASSWD=root - export PDO_MYSQL_TEST_DSN="mysql:host=localhost;dbname=test" - export PDO_MYSQL_TEST_USER=root - export PDO_MYSQL_TEST_PASS=root - export TEST_PHP_JUNIT=junit.xml - export REPORT_EXIT_STATUS=no - export SKIP_IO_CAPTURE_TESTS=1 - rm -rf junit.xml | true - php run-tests.php -P -q \ - -j$(/usr/bin/nproc) \ - -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \ - --offline \ - --show-diff \ - --show-slow 1000 \ - --set-timeout 120 \ - ${{ parameters.runTestsParameters }} - displayName: 'Test ${{ parameters.configurationName }} ${{ parameters.runTestsName }}' - condition: or(succeeded(), failed()) - - task: PublishTestResults@2 - inputs: - testResultsFormat: 'JUnit' - testResultsFiles: junit.xml - testRunTitle: '${{ parameters.configurationName }} ${{ parameters.runTestsName }}' - failTaskOnFailedTests: true - displayName: 'Export ${{ parameters.configurationName }} ${{ parameters.runTestsName }} Results' - condition: or(succeeded(), failed()) |