diff options
| author | LKedward <laurence.kedward@bristol.ac.uk> | 2020-09-27 11:43:10 +0100 |
|---|---|---|
| committer | LKedward <laurence.kedward@bristol.ac.uk> | 2020-09-28 09:44:58 +0100 |
| commit | d9dc4b4fc47182d60f9e18eda36478b9ca8f75fb (patch) | |
| tree | 800bc9dd26c2206db004e89b567ca8278f7cac52 | |
| parent | 3f6c74ff3a9f009246634b860a5805be475749e2 (diff) | |
| download | fpm-d9dc4b4fc47182d60f9e18eda36478b9ca8f75fb.tar.gz fpm-d9dc4b4fc47182d60f9e18eda36478b9ca8f75fb.zip | |
Enable fpm CI tests for local path dependency demos
| -rwxr-xr-x | ci/run_tests.bat | 18 | ||||
| -rwxr-xr-x | ci/run_tests.sh | 7 | ||||
| -rw-r--r-- | test/example_packages/README.md | 4 |
3 files changed, 27 insertions, 2 deletions
diff --git a/ci/run_tests.bat b/ci/run_tests.bat index ce79618..9c61d75 100755 --- a/ci/run_tests.bat +++ b/ci/run_tests.bat @@ -15,6 +15,7 @@ if errorlevel 1 exit 1 build\gfortran_debug\app\fpm if errorlevel 1 exit 1 + cd ..\test\example_packages\hello_world if errorlevel 1 exit 1 @@ -25,6 +26,23 @@ if errorlevel 1 exit 1 if errorlevel 1 exit 1 +cd ..\hello_fpm +if errorlevel 1 exit 1 + +..\..\..\fpm\build\gfortran_debug\app\fpm build +if errorlevel 1 exit 1 + +.\build\gfortran_debug\app\hello_fpm +if errorlevel 1 exit 1 + + +cd ..\circular_test +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 ee46cac..8c7339f 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -12,6 +12,13 @@ cd ../test/example_packages/hello_world ../../../fpm/build/gfortran_debug/app/fpm build ./build/gfortran_debug/app/hello_world +cd ../hello_fpm +../../../fpm/build/gfortran_debug/app/fpm build +./build/gfortran_debug/app/hello_fpm + +cd ../circular_test +../../../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 fd02f0d..95dad31 100644 --- a/test/example_packages/README.md +++ b/test/example_packages/README.md @@ -7,10 +7,10 @@ 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_test | Local path dependency; circular dependency | Y | N | +| 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 | -| hello_fpm | App-only; local path dependency | Y | N | +| hello_fpm | App-only; local path dependency | Y | Y | | hello_world | App-only | Y | Y | | makefile_complex | External build command (makefile); local path dependency | Y | N | | program_with_module | App-only; module+program in single source file | Y | Y | |