Merge pull request #271 from LKedward/fix-window-run-test

Fix Windows run and test commands

Author: LKedward

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
 

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

fpm/fpm.toml

@@ -1,5 +1,5 @@
 name = "fpm"
-version = "0.1.1"
+version = "0.1.2"
 license = "MIT"
 author = "fpm maintainers"
 maintainer = ""

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

fpm/src/fpm_command_line.f90

@@ -111,7 +111,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',        &