diff options
| author | Sebastian Ehlert <28669218+awvwgk@users.noreply.github.com> | 2020-09-13 16:44:57 +0200 |
|---|---|---|
| committer | Sebastian Ehlert <28669218+awvwgk@users.noreply.github.com> | 2020-09-13 16:52:19 +0200 |
| commit | d9d3e41eab8636f880f0f7bfa386f478ec457016 (patch) | |
| tree | fb51e3787b3ba01c773973333169194fd2319b8c | |
| parent | 1ce1f26cc6ceac7bdbf4cb8b302836f662b28796 (diff) | |
| download | fpm-d9d3e41eab8636f880f0f7bfa386f478ec457016.tar.gz fpm-d9d3e41eab8636f880f0f7bfa386f478ec457016.zip | |
Minor fixes, bump toml-f commit, output style for testsuite
| -rw-r--r-- | fpm/fpm.toml | 2 | ||||
| -rw-r--r-- | fpm/src/fpm/manifest/package.f90 | 3 | ||||
| -rw-r--r-- | fpm/test/testsuite.f90 | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/fpm/fpm.toml b/fpm/fpm.toml index 5e0c884..95e9d13 100644 --- a/fpm/fpm.toml +++ b/fpm/fpm.toml @@ -8,7 +8,7 @@ copyright = "2020 fpm contributors" [dependencies] [dependencies.toml-f] git = "https://github.com/toml-f/toml-f" -rev = "d7371fc8de004e34ac1d461a0d590f6015545168" +rev = "28c672d062ec4bb1e03e3e9def2add6800ec0088" [[test]] name = "fpm-test" diff --git a/fpm/src/fpm/manifest/package.f90 b/fpm/src/fpm/manifest/package.f90 index 349a9a8..dff81e5 100644 --- a/fpm/src/fpm/manifest/package.f90 +++ b/fpm/src/fpm/manifest/package.f90 @@ -184,8 +184,9 @@ contains name_present = .true. case("version", "license", "author", "maintainer", "copyright", & + & "description", "keywords", "categories", "homepage", & & "dependencies", "dev-dependencies", "test", "executable", & - & "description", "keywords", "categories", "library") + & "library") continue end select diff --git a/fpm/test/testsuite.f90 b/fpm/test/testsuite.f90 index 411fa24..9b69032 100644 --- a/fpm/test/testsuite.f90 +++ b/fpm/test/testsuite.f90 @@ -74,7 +74,8 @@ contains call collect(testsuite) do ii = 1, size(testsuite) - write(unit, '("#", *(1x, a))') "Starting", testsuite(ii)%name, "..." + write(unit, '("#", 3(1x, a), 1x, "(", i0, "/", i0, ")")') & + & "Starting", testsuite(ii)%name, "...", ii, size(testsuite) call testsuite(ii)%test(error) if (allocated(error) .neqv. testsuite(ii)%should_fail) then if (testsuite(ii)%should_fail) then @@ -91,7 +92,7 @@ contains end if end if if (allocated(error)) then - write(unit, '(a)') error%message + write(unit, fmt) "Message:", error%message end if end do |