diff options
| author | LKedward <laurence.kedward@bristol.ac.uk> | 2020-12-16 11:55:27 +0000 |
|---|---|---|
| committer | LKedward <laurence.kedward@bristol.ac.uk> | 2020-12-16 12:46:10 +0000 |
| commit | c99b2765f7e3496d742c2b265a6f9fe78c4f9e58 (patch) | |
| tree | d5d6838e307abca9a1089b4b3cc3261e493f2e75 /ci | |
| parent | 58cc2036e5af35c72e7864b5dd019c02dfd7ff23 (diff) | |
| download | fpm-c99b2765f7e3496d742c2b265a6f9fe78c4f9e58.tar.gz fpm-c99b2765f7e3496d742c2b265a6f9fe78c4f9e58.zip | |
Fix: collision between app and example executables of the same name
Use a separate example subdirectory in 'build' to store example executables.
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/run_tests.bat | 3 | ||||
| -rwxr-xr-x | ci/run_tests.sh | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ci/run_tests.bat b/ci/run_tests.bat index 42f391c..9fcb63e 100755 --- a/ci/run_tests.bat +++ b/ci/run_tests.bat @@ -116,6 +116,9 @@ del /q /f build %fpm_path% build if errorlevel 1 exit 1 +.\build\gfortran_debug\example\demo-prog +if errorlevel 1 exit 1 + .\build\gfortran_debug\app\demo-prog if errorlevel 1 exit 1 diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 7412fba..e32a41e 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -52,6 +52,7 @@ cd ../hello_complex_2 cd ../with_examples "${f_fpm_path}" build +./build/gfortran_debug/example/demo-prog ./build/gfortran_debug/app/demo-prog cd ../auto_discovery_off |