File tree Expand file tree Collapse file tree 9 files changed +62
-2
lines changed Expand file tree Collapse file tree 9 files changed +62
-2
lines changed Original file line number Diff line number Diff line change @@ -62,6 +62,23 @@ if errorlevel 1 exit 1
62
62
.\build\gfortran_debug\test\farewell_test
63
63
64
64
65
+ cd ..\auto_discovery_off
66
+ if errorlevel 1 exit 1
67
+
68
+ ..\..\..\fpm\build\gfortran_debug\app\fpm build
69
+ if errorlevel 1 exit 1
70
+
71
+ .\build\gfortran_debug\app\auto_discovery_off
72
+ if errorlevel 1 exit 1
73
+
74
+ .\build\gfortran_debug\test\my_test
75
+ if errorlevel 1 exit 1
76
+
77
+ if exist .\build\gfortran_debug\app\unused exit /B 1
78
+
79
+ if exist .\build\gfortran_debug\test\unused_test exit /B 1
80
+
81
+
65
82
cd ..\with_c
66
83
if errorlevel 1 exit 1
67
84
Original file line number Diff line number Diff line change @@ -26,6 +26,13 @@ cd ../hello_complex_2
26
26
./build/gfortran_debug/test/greet_test
27
27
./build/gfortran_debug/test/farewell_test
28
28
29
+ cd ../auto_discovery_off
30
+ ../../../fpm/build/gfortran_debug/app/fpm build
31
+ ./build/gfortran_debug/app/auto_discovery_off
32
+ ./build/gfortran_debug/test/my_test
33
+ test ! -x ./build/gfortran_debug/app/unused
34
+ test ! -x ./build/gfortran_debug/test/unused_test
35
+
29
36
cd ../with_c
30
37
../../../fpm/build/gfortran_debug/app/fpm build
31
38
./build/gfortran_debug/app/with_c
Original file line number Diff line number Diff line change @@ -121,8 +121,6 @@ subroutine cmd_build(settings)
121
121
error stop 1
122
122
end if
123
123
124
- call package% info(stdout,10 )
125
-
126
124
! Populate default build configuration if not included
127
125
if (.not. allocated (package% build_config)) then
128
126
allocate (package% build_config)
Original file line number Diff line number Diff line change @@ -6,6 +6,7 @@ the features demonstrated in each package and which versions of fpm are supporte
6
6
7
7
| Name | Features | Bootstrap (Haskell) fpm | fpm |
8
8
| ---------------------| ---------------------------------------------------------------| :-----------------------:| :---:|
9
+ | auto_discovery_off | Default layout with auto-discovery disabled | N | Y |
9
10
| circular_example | Local path dependency; circular dependency | Y | N |
10
11
| circular_test | Local path dependency; circular dependency | Y | N |
11
12
| hello_complex | Non-standard directory layout; multiple tests and executables | Y | Y |
Original file line number Diff line number Diff line change
1
+ program main
2
+ implicit none
3
+
4
+ print * , " This program should run."
5
+
6
+ end program main
Original file line number Diff line number Diff line change
1
+ program unused
2
+ implicit none
3
+
4
+ print * , " This program should NOT run."
5
+
6
+ end program unused
Original file line number Diff line number Diff line change
1
+ name = " auto_discovery_off"
2
+
3
+ [build ]
4
+ auto-executables = false
5
+ auto-tests = false
6
+
7
+
8
+ [[test ]]
9
+ name = " my_test"
10
+ source-dir =" test"
11
+ main =" my_test.f90"
12
+
Original file line number Diff line number Diff line change
1
+ program my_test
2
+ implicit none
3
+
4
+ print * , " Test passed! That was easy!"
5
+
6
+ end program my_test
Original file line number Diff line number Diff line change
1
+ program unused_test
2
+ implicit none
3
+
4
+ print * , " This program should NOT run."
5
+
6
+ end program unused_test
7
+
You can’t perform that action at this time.
0 commit comments