Skip to content

Fix Windows run and test commands #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 8, 2020
Merged

Fix Windows run and test commands #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75f8eda
Update tests: to include run and test commands
LKedward Dec 5, 2020
8f2d19a
Fix: output path for Windows
LKedward Dec 5, 2020
7f1611d
Bump patch number
LKedward Dec 5, 2020
ed6222b
Merge branch 'master' into fix-window-run-test
LKedward Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ci/run_tests.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions ci/run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion fpm/fpm.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name = "fpm"
version = "0.1.1"
version = "0.1.2"
license = "MIT"
author = "fpm maintainers"
maintainer = ""
Expand Down
1 change: 1 addition & 0 deletions fpm/src/fpm.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion fpm/src/fpm_command_line.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ subroutine get_command_line_settings(cmd_settings)
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', &
Expand Down