diff options
| -rwxr-xr-x | ci/run_tests.bat | 17 | ||||
| -rwxr-xr-x | ci/run_tests.sh | 7 | ||||
| -rw-r--r-- | fpm/src/fpm.f90 | 2 | ||||
| -rw-r--r-- | test/example_packages/README.md | 1 | ||||
| -rw-r--r-- | test/example_packages/auto_discovery_off/app/main.f90 | 6 | ||||
| -rw-r--r-- | test/example_packages/auto_discovery_off/app/unused.f90 | 6 | ||||
| -rw-r--r-- | test/example_packages/auto_discovery_off/fpm.toml | 12 | ||||
| -rw-r--r-- | test/example_packages/auto_discovery_off/test/my_test.f90 | 6 | ||||
| -rw-r--r-- | test/example_packages/auto_discovery_off/test/unused_test.f90 | 7 |
9 files changed, 62 insertions, 2 deletions
diff --git a/ci/run_tests.bat b/ci/run_tests.bat index ce79618..76e5349 100755 --- a/ci/run_tests.bat +++ b/ci/run_tests.bat @@ -62,6 +62,23 @@ if errorlevel 1 exit 1 .\build\gfortran_debug\test\farewell_test +cd ..\auto_discovery_off +if errorlevel 1 exit 1 + +..\..\..\fpm\build\gfortran_debug\app\fpm build +if errorlevel 1 exit 1 + +.\build\gfortran_debug\app\auto_discovery_off +if errorlevel 1 exit 1 + +.\build\gfortran_debug\test\my_test +if errorlevel 1 exit 1 + +if exist .\build\gfortran_debug\app\unused exit /B 1 + +if exist .\build\gfortran_debug\test\unused_test exit /B 1 + + cd ..\with_c if errorlevel 1 exit 1 diff --git a/ci/run_tests.sh b/ci/run_tests.sh index ee46cac..adff2b3 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -26,6 +26,13 @@ cd ../hello_complex_2 ./build/gfortran_debug/test/greet_test ./build/gfortran_debug/test/farewell_test +cd ../auto_discovery_off +../../../fpm/build/gfortran_debug/app/fpm build +./build/gfortran_debug/app/auto_discovery_off +./build/gfortran_debug/test/my_test +test ! -x ./build/gfortran_debug/app/unused +test ! -x ./build/gfortran_debug/test/unused_test + cd ../with_c ../../../fpm/build/gfortran_debug/app/fpm build ./build/gfortran_debug/app/with_c diff --git a/fpm/src/fpm.f90 b/fpm/src/fpm.f90 index 9db2126..fc22324 100644 --- a/fpm/src/fpm.f90 +++ b/fpm/src/fpm.f90 @@ -121,8 +121,6 @@ if (allocated(error)) then error stop 1 end if -call package%info(stdout,10) - ! Populate default build configuration if not included if (.not.allocated(package%build_config)) then allocate(package%build_config) diff --git a/test/example_packages/README.md b/test/example_packages/README.md index fd02f0d..79fadb1 100644 --- a/test/example_packages/README.md +++ b/test/example_packages/README.md @@ -6,6 +6,7 @@ the features demonstrated in each package and which versions of fpm are supporte | Name | Features | Bootstrap (Haskell) fpm | fpm | |---------------------|---------------------------------------------------------------|:-----------------------:|:---:| +| auto_discovery_off | Default layout with auto-discovery disabled | N | Y | | circular_example | Local path dependency; circular dependency | Y | N | | circular_test | Local path dependency; circular dependency | Y | N | | hello_complex | Non-standard directory layout; multiple tests and executables | Y | Y | diff --git a/test/example_packages/auto_discovery_off/app/main.f90 b/test/example_packages/auto_discovery_off/app/main.f90 new file mode 100644 index 0000000..8902dc6 --- /dev/null +++ b/test/example_packages/auto_discovery_off/app/main.f90 @@ -0,0 +1,6 @@ +program main +implicit none + +print *, "This program should run." + +end program main diff --git a/test/example_packages/auto_discovery_off/app/unused.f90 b/test/example_packages/auto_discovery_off/app/unused.f90 new file mode 100644 index 0000000..57d8153 --- /dev/null +++ b/test/example_packages/auto_discovery_off/app/unused.f90 @@ -0,0 +1,6 @@ +program unused +implicit none + +print *, "This program should NOT run." + +end program unused diff --git a/test/example_packages/auto_discovery_off/fpm.toml b/test/example_packages/auto_discovery_off/fpm.toml new file mode 100644 index 0000000..9a852df --- /dev/null +++ b/test/example_packages/auto_discovery_off/fpm.toml @@ -0,0 +1,12 @@ +name = "auto_discovery_off" + +[build] +auto-executables = false +auto-tests = false + + +[[test]] +name = "my_test" +source-dir="test" +main="my_test.f90" + diff --git a/test/example_packages/auto_discovery_off/test/my_test.f90 b/test/example_packages/auto_discovery_off/test/my_test.f90 new file mode 100644 index 0000000..fd59f9f --- /dev/null +++ b/test/example_packages/auto_discovery_off/test/my_test.f90 @@ -0,0 +1,6 @@ +program my_test +implicit none + +print *, "Test passed! That was easy!" + +end program my_test diff --git a/test/example_packages/auto_discovery_off/test/unused_test.f90 b/test/example_packages/auto_discovery_off/test/unused_test.f90 new file mode 100644 index 0000000..5c42611 --- /dev/null +++ b/test/example_packages/auto_discovery_off/test/unused_test.f90 @@ -0,0 +1,7 @@ +program unused_test +implicit none + +print *, "This program should NOT run." + +end program unused_test + |