diff options
author | LKedward <laurence.kedward@bristol.ac.uk> | 2021-07-16 15:24:25 +0100 |
---|---|---|
committer | LKedward <laurence.kedward@bristol.ac.uk> | 2021-07-16 15:24:25 +0100 |
commit | f884bfd38a546dba12ccabcce8581e7bab29e51f (patch) | |
tree | 9c0f3822b59741f18cfb8feef02db7d27caf712d /test/fpm_test | |
parent | 53027990c205eb905ff534544f4752ea92e747d7 (diff) | |
parent | 68937a4eae6a71b74edbf762c574cc2dc22bb2d6 (diff) | |
download | fpm-f884bfd38a546dba12ccabcce8581e7bab29e51f.tar.gz fpm-f884bfd38a546dba12ccabcce8581e7bab29e51f.zip |
Merge branch 'upstream_master' into file-listing
Diffstat (limited to 'test/fpm_test')
-rw-r--r-- | test/fpm_test/test_manifest.f90 | 4 | ||||
-rw-r--r-- | test/fpm_test/test_toml.f90 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/fpm_test/test_manifest.f90 b/test/fpm_test/test_manifest.f90 index 69c86fd..0f64aca 100644 --- a/test/fpm_test/test_manifest.f90 +++ b/test/fpm_test/test_manifest.f90 @@ -85,13 +85,13 @@ contains & '[dependencies.fpm]', & & 'git = "https://github.com/fortran-lang/fpm"', & & '[[executable]]', & - & 'name = "example-#1" # comment', & + & 'name = "example-1" # comment', & & 'source-dir = "prog"', & & '[dependencies]', & & 'toml-f.git = "git@github.com:toml-f/toml-f.git"', & & '"toml..f" = { path = ".." }', & & '[["executable"]]', & - & 'name = "example-#2"', & + & 'name = "example-2"', & & 'source-dir = "prog"', & & '[executable.dependencies]', & & '[''library'']', & diff --git a/test/fpm_test/test_toml.f90 b/test/fpm_test/test_toml.f90 index ba48307..1ffea1d 100644 --- a/test/fpm_test/test_toml.f90 +++ b/test/fpm_test/test_toml.f90 @@ -41,13 +41,13 @@ contains & '[dependencies.fpm]', & & 'git = "https://github.com/fortran-lang/fpm"', & & '[[executable]]', & - & 'name = "example-#1" # comment', & + & 'name = "example-1" # comment', & & 'source-dir = "prog"', & & '[dependencies]', & & 'toml-f.git = "git@github.com:toml-f/toml-f.git"', & & '"toml..f" = { path = ".." }', & & '[["executable"]]', & - & 'name = "example-#2"', & + & 'name = "example-2"', & & 'source-dir = "prog"', & & '[executable.dependencies]', & & '[''library'']', & |