From 9dee51cc486ae213188d8248515b5d010b976644 Mon Sep 17 00:00:00 2001
From: Brad Richardson <everythingfunctional@protonmail.com>
Date: Wed, 28 Oct 2020 12:03:51 -0500
Subject: Fix Windows CI script

---
 ci/run_tests.bat | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'ci')

diff --git a/ci/run_tests.bat b/ci/run_tests.bat
index 7d0b178..2a68f53 100755
--- a/ci/run_tests.bat
+++ b/ci/run_tests.bat
@@ -12,13 +12,15 @@ if errorlevel 1 exit 1
 fpm test
 if errorlevel 1 exit 1
 
-build\gfortran_debug\app\fpm
+for /f %%i in ('where /r build fpm.exe') do set fpm_path=%%i
+
+%fpm_path%
 if errorlevel 1 exit 1
 
 cd ..\example_packages\hello_world
 if errorlevel 1 exit 1
 
-..\..\fpm\build\gfortran_debug\app\fpm build
+%fpm_path% build
 if errorlevel 1 exit 1
 
 .\build\gfortran_debug\app\hello_world
@@ -28,7 +30,7 @@ if errorlevel 1 exit 1
 cd ..\hello_fpm
 if errorlevel 1 exit 1
 
-..\..\fpm\build\gfortran_debug\app\fpm build
+%fpm_path% build
 if errorlevel 1 exit 1
 
 .\build\gfortran_debug\app\hello_fpm
@@ -38,21 +40,21 @@ if errorlevel 1 exit 1
 cd ..\circular_test
 if errorlevel 1 exit 1
 
-..\..\fpm\build\gfortran_debug\app\fpm build
+%fpm_path% build
 if errorlevel 1 exit 1
 
 
 cd ..\circular_example
 if errorlevel 1 exit 1
 
-..\..\fpm\build\gfortran_debug\app\fpm build
+%fpm_path% build
 if errorlevel 1 exit 1
 
 
 cd ..\hello_complex
 if errorlevel 1 exit 1
 
-..\..\fpm\build\gfortran_debug\app\fpm build
+%fpm_path% build
 if errorlevel 1 exit 1
 
 .\build\gfortran_debug\app\say_Hello
@@ -71,7 +73,7 @@ if errorlevel 1 exit 1
 cd ..\hello_complex_2
 if errorlevel 1 exit 1
 
-..\..\fpm\build\gfortran_debug\app\fpm build
+%fpm_path% build
 if errorlevel 1 exit 1
 
 .\build\gfortran_debug\app\say_hello_world
@@ -89,7 +91,7 @@ if errorlevel 1 exit 1
 cd ..\auto_discovery_off
 if errorlevel 1 exit 1
 
-..\..\fpm\build\gfortran_debug\app\fpm build
+%fpm_path% build
 if errorlevel 1 exit 1
 
 .\build\gfortran_debug\app\auto_discovery_off
@@ -106,7 +108,7 @@ if exist .\build\gfortran_debug\test\unused_test exit /B 1
 cd ..\with_c
 if errorlevel 1 exit 1
 
-..\..\fpm\build\gfortran_debug\app\fpm build
+%fpm_path% build
 if errorlevel 1 exit 1
 
 .\build\gfortran_debug\app\with_c
@@ -116,14 +118,14 @@ if errorlevel 1 exit 1
 cd ..\submodules
 if errorlevel 1 exit 1
 
-..\..\fpm\build\gfortran_debug\app\fpm build
+%fpm_path% build
 if errorlevel 1 exit 1
 
 
 cd ..\program_with_module
 if errorlevel 1 exit 1
 
-..\..\fpm\build\gfortran_debug\app\fpm build
+%fpm_path% build
 if errorlevel 1 exit 1
 
 .\build\gfortran_debug\app\Program_with_module
-- 
cgit v1.2.3