diff --git a/test/Performance/benchmark/pdo_sqlsrv/PDOFetchLargeBench.php b/test/Performance/benchmark/pdo_sqlsrv/PDOFetchLargeBench.php index 26fab48c..c726d905 100644 --- a/test/Performance/benchmark/pdo_sqlsrv/PDOFetchLargeBench.php +++ b/test/Performance/benchmark/pdo_sqlsrv/PDOFetchLargeBench.php @@ -23,7 +23,7 @@ class PDOFetchLargeBench $this->conn = PDOSqlsrvUtil::connect(); } /* - * Each iteration calls prepare, execute and fetch APIs to fetch the already populdated data + * Each iteration calls prepare, execute and fetch APIs to fetch the already populated data */ public function benchFetchWithPrepare() { diff --git a/test/Performance/benchmark/sqlsrv/SqlsrvFetchLargeBench.php b/test/Performance/benchmark/sqlsrv/SqlsrvFetchLargeBench.php index 24dee142..cccf11ce 100644 --- a/test/Performance/benchmark/sqlsrv/SqlsrvFetchLargeBench.php +++ b/test/Performance/benchmark/sqlsrv/SqlsrvFetchLargeBench.php @@ -23,7 +23,7 @@ class SqlsrvFetchLargeBench $this->conn = SqlsrvUtil::connect(); } /* - * Each iteration calls prepare, execute and fetch APIs to fetch the already populdated data + * Each iteration calls prepare, execute and fetch APIs to fetch the already populated data */ public function benchFetchWithPrepare() { diff --git a/test/Performance/setup_env_windows.ps1 b/test/Performance/setup_env_windows.ps1 index a6b83633..bbafb8d2 100644 --- a/test/Performance/setup_env_windows.ps1 +++ b/test/Performance/setup_env_windows.ps1 @@ -41,18 +41,19 @@ $phpDir="C:\php" Remove-Item $phpDir -Recurse -ErrorAction Ignore New-Item -ItemType directory -Path $phpDir Expand-Archive $PHP_ZIP -DestinationPath $phpDir -Copy-Item $SQLSRV_DRIVER $phpDir\ext -Copy-Item $PDO_DRIVER $phpDir\ext + +# copy drivers to extensions directory and rename to a standard nomenclature +# for consistency with run-perf_tests.py +Copy-Item $SQLSRV_DRIVER $phpDir\ext\php_sqlsrv.dll +Copy-Item $PDO_DRIVER $phpDir\ext\php_pdo_sqlsrv.dll # setup driver Copy-Item $phpDir\php.ini-production $phpDir\php.ini Add-Content $phpDir\php.ini "extension=$phpDir\ext\php_openssl.dll" Add-Content $phpDir\php.ini "extension=$phpDir\ext\php_mbstring.dll" -$driverName=Split-Path $SQLSRV_DRIVER -leaf -Add-Content $phpDir\php.ini "extension=$phpDir\ext\$driverName" -$driverName=Split-Path $PDO_DRIVER -leaf -Add-Content $phpDir\php.ini "extension=$phpDir\ext\$driverName" +Add-Content $phpDir\php.ini "extension=$phpDir\ext\php_sqlsrv.dll" +Add-Content $phpDir\php.ini "extension=$phpDir\ext\php_pdo_sqlsrv.dll" Move-Item $phpDir\php.ini C:\Windows -force Copy-Item $phpDir\ssleay32.dll C:\Windows -force