diff options
| author | LKedward <laurence.kedward@bristol.ac.uk> | 2020-09-27 12:14:04 +0100 |
|---|---|---|
| committer | LKedward <laurence.kedward@bristol.ac.uk> | 2020-09-28 09:46:04 +0100 |
| commit | 6f8a4466edde51653439f03a34e6fab6f2ff2071 (patch) | |
| tree | 636d5a5c19bed42a39abd56eeb73d4a6cd9707b4 | |
| parent | c6a96464ebed9b8363b3d5571fdc9da5c90fe9ca (diff) | |
| download | fpm-6f8a4466edde51653439f03a34e6fab6f2ff2071.tar.gz fpm-6f8a4466edde51653439f03a34e6fab6f2ff2071.zip | |
Add: circular_example demo to fpm CI scripts
Now supported with local dev-dependencies
| -rwxr-xr-x | ci/run_tests.bat | 7 | ||||
| -rwxr-xr-x | ci/run_tests.sh | 3 | ||||
| -rw-r--r-- | test/example_packages/README.md | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/ci/run_tests.bat b/ci/run_tests.bat index 9c61d75..745f14f 100755 --- a/ci/run_tests.bat +++ b/ci/run_tests.bat @@ -43,6 +43,13 @@ if errorlevel 1 exit 1 if errorlevel 1 exit 1 +cd ..\circular_example +if errorlevel 1 exit 1 + +..\..\..\fpm\build\gfortran_debug\app\fpm build +if errorlevel 1 exit 1 + + cd ..\hello_complex if errorlevel 1 exit 1 diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 8c7339f..6937c6b 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -19,6 +19,9 @@ cd ../hello_fpm cd ../circular_test ../../../fpm/build/gfortran_debug/app/fpm build +cd ../circular_example +../../../fpm/build/gfortran_debug/app/fpm build + cd ../hello_complex ../../../fpm/build/gfortran_debug/app/fpm build ./build/gfortran_debug/app/say_Hello diff --git a/test/example_packages/README.md b/test/example_packages/README.md index 95dad31..ee2a908 100644 --- a/test/example_packages/README.md +++ b/test/example_packages/README.md @@ -6,7 +6,7 @@ the features demonstrated in each package and which versions of fpm are supporte | Name | Features | Bootstrap (Haskell) fpm | fpm | |---------------------|---------------------------------------------------------------|:-----------------------:|:---:| -| circular_example | Local path dependency; circular dependency | Y | N | +| circular_example | Local path dependency; circular dependency | Y | Y | | circular_test | Local path dependency; circular dependency | Y | Y | | hello_complex | Non-standard directory layout; multiple tests and executables | Y | Y | | hello_complex_2 | Auto-discovery of tests and executables with modules | N | Y | |