aboutsummaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorBrad Richardson <everythingfunctional@protonmail.com>2020-10-28 12:03:51 -0500
committerBrad Richardson <everythingfunctional@protonmail.com>2020-10-28 12:03:51 -0500
commit9dee51cc486ae213188d8248515b5d010b976644 (patch)
tree57e5ec1de2c30f64cf65a22c4aba5fb4249bc866 /ci
parent6f7ae5b6f1b45a4d8c12dfca2d188f316efe993b (diff)
downloadfpm-9dee51cc486ae213188d8248515b5d010b976644.tar.gz
fpm-9dee51cc486ae213188d8248515b5d010b976644.zip
Fix Windows CI script
Diffstat (limited to 'ci')
-rwxr-xr-xci/run_tests.bat24
1 files changed, 13 insertions, 11 deletions
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