WIP III

Author: mvorisek

.github/scripts/windows/build_task.bat

@@ -60,9 +60,6 @@ if %errorlevel% neq 0 exit /b 3
 if "%THREAD_SAFE%" equ "" set ADD_CONF=%ADD_CONF% --disable-zts
 if "%INTRINSICS%" neq "" set ADD_CONF=%ADD_CONF% --enable-native-intrinsics=%INTRINSICS%
 
-set EXT_EXCLUDE_FROM_TEST=snmp,oci8_12c,pdo_oci,pdo_firebird,ldap,imap,ftp
-if "%OPCACHE%" equ "" set EXT_EXCLUDE_FROM_TEST=%EXT_EXCLUDE_FROM_TEST%,opcache
-
 if "%PLATFORM%" == "x86" (
 	set CFLAGS=/W1
 ) else (
@@ -77,7 +74,7 @@ cmd /c configure.bat ^
 	--enable-object-out-dir=%PHP_BUILD_OBJ_DIR% ^
 	--with-php-build=%DEPS_DIR% ^
 	%ADD_CONF% ^
-	--with-test-ini-ext-exclude=%EXT_EXCLUDE_FROM_TEST%
+	--with-test-ini-ext-exclude=snmp,oci8_12c,pdo_oci,pdo_firebird,ldap,imap,ftp,opcache
 if %errorlevel% neq 0 exit /b 3
 
 nmake /NOLOGO /S

.github/scripts/windows/test_task.bat

@@ -23,7 +23,6 @@ if not exist "%DEPS_DIR%" (
 )
 
 if /i "%APPVEYOR%" equ "True" (
-    rem setup MySQL related exts
     set MYSQL_PWD=Password12!
     set MYSQL_TEST_PASSWD=%MYSQL_PWD%
     set MYSQL_TEST_USER=root
@@ -37,7 +36,6 @@ if /i "%APPVEYOR%" equ "True" (
     "C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" --user=%MYSQL_TEST_USER% -e "CREATE DATABASE IF NOT EXISTS test"
     if %errorlevel% neq 0 exit /b 3
 
-    rem setup PostgreSQL related exts
     set PGUSER=postgres
     set PGPASSWORD=Password12!
     rem set PGSQL_TEST_CONNSTR=host=127.0.0.1 dbname=test port=5432 user=postgres password=Password12!
@@ -46,7 +44,6 @@ if /i "%APPVEYOR%" equ "True" (
     "C:\Program Files\PostgreSQL\10\bin\createdb.exe" test
     if %errorlevel% neq 0 exit /b 3
 
-    rem setup ODBC related exts
     set ODBC_TEST_USER=sa
     set ODBC_TEST_PASS=Password12!
     set ODBC_TEST_DSN=Driver={ODBC Driver 13 for SQL Server};Server=^(local^)\SQL2017;Database=master;uid=%ODBC_TEST_USER%;pwd=%ODBC_TEST_PASS%
@@ -72,9 +69,6 @@ rem set OPENSSL_CONF=%OPENSSLDIR%\openssl.cnf
 set OPENSSL_CONF=
 rem set SSLEAY_CONF=
 
-rem prepare for Opcache
-if "%OPCACHE%" neq "" set OPCACHE_OPTS=-d opcache.enable=1 -d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=16M
-
 rem prepare for enchant
 mkdir C:\usr\local\lib\enchant-2
 if %errorlevel% neq 0 exit /b 3
@@ -108,5 +102,6 @@ mkdir c:\tests_tmp
 
 set TEST_PHP_JUNIT=c:\junit.out.xml
 
+set OPCACHE_OPTS=-d opcache.enable=1 -d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=16M
 nmake test TESTS="%OPCACHE_OPTS% -q --offline -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP --color --show-diff --show-slow 1000 --set-timeout 120 --temp-source c:\tests_tmp --temp-target c:\tests_tmp -j2"
 if %errorlevel% neq 0 exit /b %errorlevel%