Skip to content

Commit 9dee51c

Browse files
Fix Windows CI script
1 parent 6f7ae5b commit 9dee51c

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

ci/run_tests.bat

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ if errorlevel 1 exit 1
1212
fpm test
1313
if errorlevel 1 exit 1
1414

15-
build\gfortran_debug\app\fpm
15+
for /f %%i in ('where /r build fpm.exe') do set fpm_path=%%i
16+
17+
%fpm_path%
1618
if errorlevel 1 exit 1
1719

1820
cd ..\example_packages\hello_world
1921
if errorlevel 1 exit 1
2022

21-
..\..\fpm\build\gfortran_debug\app\fpm build
23+
%fpm_path% build
2224
if errorlevel 1 exit 1
2325

2426
.\build\gfortran_debug\app\hello_world
@@ -28,7 +30,7 @@ if errorlevel 1 exit 1
2830
cd ..\hello_fpm
2931
if errorlevel 1 exit 1
3032

31-
..\..\fpm\build\gfortran_debug\app\fpm build
33+
%fpm_path% build
3234
if errorlevel 1 exit 1
3335

3436
.\build\gfortran_debug\app\hello_fpm
@@ -38,21 +40,21 @@ if errorlevel 1 exit 1
3840
cd ..\circular_test
3941
if errorlevel 1 exit 1
4042

41-
..\..\fpm\build\gfortran_debug\app\fpm build
43+
%fpm_path% build
4244
if errorlevel 1 exit 1
4345

4446

4547
cd ..\circular_example
4648
if errorlevel 1 exit 1
4749

48-
..\..\fpm\build\gfortran_debug\app\fpm build
50+
%fpm_path% build
4951
if errorlevel 1 exit 1
5052

5153

5254
cd ..\hello_complex
5355
if errorlevel 1 exit 1
5456

55-
..\..\fpm\build\gfortran_debug\app\fpm build
57+
%fpm_path% build
5658
if errorlevel 1 exit 1
5759

5860
.\build\gfortran_debug\app\say_Hello
@@ -71,7 +73,7 @@ if errorlevel 1 exit 1
7173
cd ..\hello_complex_2
7274
if errorlevel 1 exit 1
7375

74-
..\..\fpm\build\gfortran_debug\app\fpm build
76+
%fpm_path% build
7577
if errorlevel 1 exit 1
7678

7779
.\build\gfortran_debug\app\say_hello_world
@@ -89,7 +91,7 @@ if errorlevel 1 exit 1
8991
cd ..\auto_discovery_off
9092
if errorlevel 1 exit 1
9193

92-
..\..\fpm\build\gfortran_debug\app\fpm build
94+
%fpm_path% build
9395
if errorlevel 1 exit 1
9496

9597
.\build\gfortran_debug\app\auto_discovery_off
@@ -106,7 +108,7 @@ if exist .\build\gfortran_debug\test\unused_test exit /B 1
106108
cd ..\with_c
107109
if errorlevel 1 exit 1
108110

109-
..\..\fpm\build\gfortran_debug\app\fpm build
111+
%fpm_path% build
110112
if errorlevel 1 exit 1
111113

112114
.\build\gfortran_debug\app\with_c
@@ -116,14 +118,14 @@ if errorlevel 1 exit 1
116118
cd ..\submodules
117119
if errorlevel 1 exit 1
118120

119-
..\..\fpm\build\gfortran_debug\app\fpm build
121+
%fpm_path% build
120122
if errorlevel 1 exit 1
121123

122124

123125
cd ..\program_with_module
124126
if errorlevel 1 exit 1
125127

126-
..\..\fpm\build\gfortran_debug\app\fpm build
128+
%fpm_path% build
127129
if errorlevel 1 exit 1
128130

129131
.\build\gfortran_debug\app\Program_with_module

0 commit comments

Comments
 (0)