diff options
author | Laurence Kedward <laurence.kedward@bristol.ac.uk> | 2021-03-24 09:28:00 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-24 09:28:00 +0000 |
commit | cb3337b021c5e590c34ec5e0b65b45cc7d497122 (patch) | |
tree | 8de6bf21f0c94890dfec8d236f4f7efc5a0b523d /ci | |
parent | 47c410e36a767976ed877e6b5ca41b4efdd8a668 (diff) | |
parent | 6743247460ee7c61de81bec3319f2cedddef07c2 (diff) | |
download | fpm-cb3337b021c5e590c34ec5e0b65b45cc7d497122.tar.gz fpm-cb3337b021c5e590c34ec5e0b65b45cc7d497122.zip |
Merge pull request #377 from LKedward/include-dir
Add explicit include-dir key to manifest
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/run_tests.bat | 24 | ||||
-rwxr-xr-x | ci/run_tests.sh | 9 |
2 files changed, 33 insertions, 0 deletions
diff --git a/ci/run_tests.bat b/ci/run_tests.bat index f5b57c1..e010e9f 100755 --- a/ci/run_tests.bat +++ b/ci/run_tests.bat @@ -187,4 +187,28 @@ if errorlevel 1 exit 1 %fpm_path% run --target gomp_test if errorlevel 1 exit 1 + +cd ..\fortran_includes +if errorlevel 1 exit 1 + +del /q /f build +%fpm_path% build +if errorlevel 1 exit 1 + + +cd ..\c_includes +if errorlevel 1 exit 1 + +del /q /f build +%fpm_path% build +if errorlevel 1 exit 1 + + +cd ..\c_header_only +if errorlevel 1 exit 1 + +del /q /f build +%fpm_path% build +if errorlevel 1 exit 1 + cd ..\.. diff --git a/ci/run_tests.sh b/ci/run_tests.sh index bca70cc..647c57a 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -89,5 +89,14 @@ cd ../link_executable "${f_fpm_path}" build "${f_fpm_path}" run --target gomp_test +cd ../fortran_includes +"${f_fpm_path}" build + +cd ../c_includes +"${f_fpm_path}" build + +cd ../c_header_only +"${f_fpm_path}" build + # Cleanup rm -rf ./*/build |