From 7e91da50081c0db1eb22ffcfe5a265a0780a24e3 Mon Sep 17 00:00:00 2001
From: yitam <v-yitam@microsoft.com>
Date: Tue, 9 May 2017 12:59:31 -0700
Subject: [PATCH] uncomment creating test DBs

---
 appveyor.yml | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index c80f2236..b8604587 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -27,16 +27,6 @@ environment:
         PHP_SDK_DIR: c:\projects\php\x64
         PHP_INSTALL_DIR: c:\projects\php\x64\bin        
         platform: x64
-      - BUILD_PLATFORM: x86
-        TEST_PHP_SQL_SERVER: (local)\SQL2008R2SP2
-        SQL_INSTANCE: SQL2008R2SP2
-        PHP_VC: 14
-        PHP_MAJOR_VER: 7.1
-        PHP_MINOR_VER: latest
-        PHP_SDK_DIR: c:\projects\php\x86
-        PHP_INSTALL_DIR: c:\projects\php\x86\bin
-        PHP_ZTS: --disable-zts
-        platform: x86
       - BUILD_PLATFORM: x64
         TEST_PHP_SQL_SERVER: (local)\SQL2012SP1
         SQL_INSTANCE: SQL2012SP1
@@ -47,6 +37,16 @@ environment:
         PHP_INSTALL_DIR: c:\projects\php\x64\bin
         PHP_ZTS: --disable-zts
         platform: x64
+      - BUILD_PLATFORM: x86
+        TEST_PHP_SQL_SERVER: (local)\SQL2008R2SP2
+        SQL_INSTANCE: SQL2008R2SP2
+        PHP_VC: 14
+        PHP_MAJOR_VER: 7.1
+        PHP_MINOR_VER: latest
+        PHP_SDK_DIR: c:\projects\php\x86
+        PHP_INSTALL_DIR: c:\projects\php\x86\bin
+        PHP_ZTS: --disable-zts
+        platform: x86
       - BUILD_PLATFORM: x86
         TEST_PHP_SQL_SERVER: (local)\SQL2014
         SQL_INSTANCE: SQL2014
@@ -115,15 +115,12 @@ install:
     #- echo Downloading PHP deps [%PHP_DEPSVER%]
     #- ps: (new-object net.webclient).DownloadFile('http://windows.php.net/downloads/php-sdk/deps-' + ${env:PHP_DEPSVER} + '-vc' + ${env:PHP_VC} + '-' + ${env:BUILD_PLATFORM} + '.7z', ${env:APPVEYOR_BUILD_FOLDER} + '\..\deps.7z')
     - echo Downloading MSODBCSQL 13.1
-    #- ps: $msiPath = "$($env:USERPROFILE)\msodbcsql.msi"
     - ps: >-
         If ($env:BUILD_PLATFORM -Match "x64") {
             (new-object net.webclient).DownloadFile('https://download.microsoft.com/download/D/5/E/D5EEF288-A277-45C8-855B-8E2CB7E25B96/x64/msodbcsql.msi', 'c:\projects\msodbcsql.msi')
         } Else {
             (new-object net.webclient).DownloadFile('https://download.microsoft.com/download/D/5/E/D5EEF288-A277-45C8-855B-8E2CB7E25B96/x86/msodbcsql.msi', 'c:\projects\msodbcsql.msi')
         }    
-    #- ps: msiexec /i msodbcsql.msi /quiet /qn /norestart
-    #- ps: msiexec /i msodbcsql.msi /quiet /norestart /l install.log
     - cmd /c start /wait msiexec /i "c:\projects\msodbcsql.msi" /q
     - echo Checking the version of MSODBCSQL 
     - reg query "HKLM\SOFTWARE\ODBC\odbcinst.ini\ODBC Driver 13 for SQL Server"
@@ -171,17 +168,17 @@ test_script:
     - cd %PHP_INSTALL_DIR%  
     - php --ini
     - php -i
-    #- python -V    
-    #- Echo setup test database for SQLSRV tests  - %SQLSRV_DBNAME%
-    #- python %APPVEYOR_BUILD_FOLDER%\test\setup\setup_dbs.py -dbname %SQLSRV_DBNAME%
-    #- Echo setup test database for PDO_SQLSRV tests - %PDOSQLSRV_DBNAME%
-    #- python %APPVEYOR_BUILD_FOLDER%\test\setup\setup_dbs.py -dbname %PDOSQLSRV_DBNAME%
+    - python -V    
+    - Echo setup test database for SQLSRV tests  - %SQLSRV_DBNAME%
+    - python %APPVEYOR_BUILD_FOLDER%\test\setup\setup_dbs.py -dbname %SQLSRV_DBNAME%
+    - Echo setup test database for PDO_SQLSRV tests - %PDOSQLSRV_DBNAME%
+    - python %APPVEYOR_BUILD_FOLDER%\test\setup\setup_dbs.py -dbname %PDOSQLSRV_DBNAME%
     - php run-tests.php -p php.exe %APPVEYOR_BUILD_FOLDER%\test\pdo_sqlsrv\*.phpt > %APPVEYOR_BUILD_FOLDER%\test\pdo_sqlsrv.log 2>&1    
     - type %APPVEYOR_BUILD_FOLDER%\test\pdo_sqlsrv.log
     - php run-tests.php -p php.exe %APPVEYOR_BUILD_FOLDER%\test\sqlsrv\*.phpt > %APPVEYOR_BUILD_FOLDER%\test\sqlsrv.log 2>&1    
     - type %APPVEYOR_BUILD_FOLDER%\test\sqlsrv.log
-    #- python %APPVEYOR_BUILD_FOLDER%\test\setup\cleanup_dbs.py -dbname %SQLSRV_DBNAME%
-    #- python %APPVEYOR_BUILD_FOLDER%\test\setup\cleanup_dbs.py -dbname %PDOSQLSRV_DBNAME%
+    - python %APPVEYOR_BUILD_FOLDER%\test\setup\cleanup_dbs.py -dbname %SQLSRV_DBNAME%
+    - python %APPVEYOR_BUILD_FOLDER%\test\setup\cleanup_dbs.py -dbname %PDOSQLSRV_DBNAME%
 
 after_test:
     - cd %APPVEYOR_BUILD_FOLDER%\test\