From 7c12d40536ff43486031896a9e796f2edebce4f3 Mon Sep 17 00:00:00 2001
From: Dengke Tang <dengket@amazon.com>
Date: Thu, 23 Feb 2023 16:47:03 -0800
Subject: [PATCH] get the right php

---
 .github/workflows/ci.yml  |  2 +-
 dev-scripts/run_tests.bat | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index da0ae23..d2b8e88 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -121,7 +121,7 @@ jobs:
         .\configure --with-prefix=${{steps.setup-php-sdk.outputs.prefix}} --enable-awscrt=shared
         nmake
         nmake generate-php-ini
-        .\dev-scripts\run_tests
+        .\dev-scripts\run_tests ${{steps.setup-php-sdk.outputs.prefix}}\php
 
   # windows-vc14:
   #   runs-on: windows-latest
diff --git a/dev-scripts/run_tests.bat b/dev-scripts/run_tests.bat
index b17fc04..a712b36 100644
--- a/dev-scripts/run_tests.bat
+++ b/dev-scripts/run_tests.bat
@@ -5,6 +5,13 @@ REM Run command to get composer_dir
 set "composer_dir="
 for /f "usebackq delims=" %%i in (`where composer.phar`) do set "composer_dir=%%i"
 
+set "PHP_BINARY=php"
+
+if not "%~1"=="" (
+  set "PHP_BINARY=%~1"
+)
+
+
 REM Check if composer_dir was found
 if "%composer_dir%"=="" (
   echo No composer found.
@@ -16,13 +23,13 @@ if "%composer_dir%"=="" (
   echo %work_dir%
   ls x64\
 
-  php -c php-win.ini %composer_dir% update
+  %PHP_BINARY% -c php-win.ini %composer_dir% update
   if %errorlevel% neq 0 (
     echo An error occurred while using composer to get dependence
     exit /b %errorlevel%
   )
 
-  php -c php-win.ini vendor/bin/phpunit tests --debug
+  %PHP_BINARY% -c php-win.ini vendor/bin/phpunit tests --debug
   if %errorlevel% neq 0 (
     echo An error occurred while running unittests
     exit /b %errorlevel%