diff options
| author | Laurence Kedward <laurence.kedward@bristol.ac.uk> | 2020-12-08 15:53:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-08 15:53:08 +0000 |
| commit | 6e46fba605e43473e7d7f680f13ca8ff02ec436e (patch) | |
| tree | 53ee494f1a97a56b1ba012c94bbe0c2677a129b8 | |
| parent | 849db65f153d7019b1e6286df76ec38e49d1e8ac (diff) | |
| parent | ed6222b080d56c7768ec413bef631520a553ee42 (diff) | |
| download | fpm-6e46fba605e43473e7d7f680f13ca8ff02ec436e.tar.gz fpm-6e46fba605e43473e7d7f680f13ca8ff02ec436e.zip | |
Merge pull request #271 from LKedward/fix-window-run-test
Fix Windows run and test commands
| -rwxr-xr-x | ci/run_tests.bat | 6 | ||||
| -rwxr-xr-x | ci/run_tests.sh | 2 | ||||
| -rw-r--r-- | fpm/fpm.toml | 2 | ||||
| -rw-r--r-- | fpm/src/fpm.f90 | 1 | ||||
| -rw-r--r-- | fpm/src/fpm_command_line.f90 | 2 |
5 files changed, 11 insertions, 2 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 diff --git a/fpm/fpm.toml b/fpm/fpm.toml index 66e5049..70c9603 100644 --- a/fpm/fpm.toml +++ b/fpm/fpm.toml @@ -1,5 +1,5 @@ name = "fpm" -version = "0.1.1" +version = "0.1.2" license = "MIT" author = "fpm maintainers" maintainer = "" diff --git a/fpm/src/fpm.f90 b/fpm/src/fpm.f90 index 67be1cc..e1a322e 100644 --- a/fpm/src/fpm.f90 +++ b/fpm/src/fpm.f90 @@ -175,6 +175,7 @@ subroutine build_model(model, settings, package, error) allocate(package_list(1)) package_list(1)%s = package%name + if(settings%compiler.eq.'')then model%fortran_compiler = 'gfortran' else diff --git a/fpm/src/fpm_command_line.f90 b/fpm/src/fpm_command_line.f90 index 640adad..7fac111 100644 --- a/fpm/src/fpm_command_line.f90 +++ b/fpm/src/fpm_command_line.f90 @@ -111,7 +111,7 @@ contains case default ; os_type = "OS Type: UNKNOWN" end select version_text = [character(len=80) :: & - & 'Version: 0.1.1, alpha', & + & 'Version: 0.1.2, alpha', & & 'Program: fpm(1)', & & 'Description: A Fortran package manager and build system', & & 'Home Page: https://github.com/fortran-lang/fpm', & |