diff options
author | LKedward <laurence.kedward@bristol.ac.uk> | 2020-10-03 11:08:29 +0100 |
---|---|---|
committer | LKedward <laurence.kedward@bristol.ac.uk> | 2020-10-03 11:15:47 +0100 |
commit | 71554f61b99c93aea6afdfe0ede682bbf3f89887 (patch) | |
tree | bf26e8333172bff52b9a04e0ffd2cf01b5b914df /ci | |
parent | 64a0f72db4080c2ca18e8ba7bbad5825c02ab079 (diff) | |
parent | 75c1da54b337a08f8205db19e49606e30b4ce2bb (diff) | |
download | fpm-71554f61b99c93aea6afdfe0ede682bbf3f89887.tar.gz fpm-71554f61b99c93aea6afdfe0ede682bbf3f89887.zip |
Merge remote-tracking branch 'upstream/master' into local-depends
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/run_tests.bat | 17 | ||||
-rwxr-xr-x | ci/run_tests.sh | 7 |
2 files changed, 24 insertions, 0 deletions
diff --git a/ci/run_tests.bat b/ci/run_tests.bat index 745f14f..645fd49 100755 --- a/ci/run_tests.bat +++ b/ci/run_tests.bat @@ -87,6 +87,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 6937c6b..7ca33d8 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -36,6 +36,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 |