diff options
| author | LKedward <laurence.kedward@bristol.ac.uk> | 2020-12-09 14:21:19 +0000 |
|---|---|---|
| committer | LKedward <laurence.kedward@bristol.ac.uk> | 2020-12-09 14:21:19 +0000 |
| commit | 4e9ac3ef08a8e81da164a0d99a43f292666b8aa4 (patch) | |
| tree | 7a6aebb5206fd511439ba6e41a7c891fcd574459 /ci | |
| parent | 3d1ac15bdd2ba28565482195fcb528d96012e35a (diff) | |
| parent | 6e46fba605e43473e7d7f680f13ca8ff02ec436e (diff) | |
| download | fpm-4e9ac3ef08a8e81da164a0d99a43f292666b8aa4.tar.gz fpm-4e9ac3ef08a8e81da164a0d99a43f292666b8aa4.zip | |
Merge remote-tracking branch 'upstream/master' into dev-docs-model
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/run_tests.bat | 6 | ||||
| -rwxr-xr-x | ci/run_tests.sh | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ci/run_tests.bat b/ci/run_tests.bat index 533590d..22be2db 100755 --- a/ci/run_tests.bat +++ b/ci/run_tests.bat @@ -36,6 +36,9 @@ if errorlevel 1 exit 1 .\build\gfortran_debug\app\hello_world if errorlevel 1 exit 1 +%fpm_path% run +if errorlevel 1 exit 1 + cd ..\hello_fpm if errorlevel 1 exit 1 @@ -71,6 +74,9 @@ del /q /f build %fpm_path% build if errorlevel 1 exit 1 +%fpm_path% test +if errorlevel 1 exit 1 + .\build\gfortran_debug\app\say_Hello if errorlevel 1 exit 1 diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 3588012..85484e5 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -23,6 +23,7 @@ rm -rf ./*/build cd hello_world "${f_fpm_path}" build ./build/gfortran_debug/app/hello_world +"${f_fpm_path}" run cd ../hello_fpm "${f_fpm_path}" build @@ -36,6 +37,7 @@ cd ../circular_example cd ../hello_complex "${f_fpm_path}" build +"${f_fpm_path}" test ./build/gfortran_debug/app/say_Hello ./build/gfortran_debug/app/say_goodbye ./build/gfortran_debug/test/greet_test |