Skip to content
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

Jump to bottom

Do not pass in quotes in manifest tests #806

Merged
merged 1 commit into from
Nov 27, 2022
Merged

Do not pass in quotes in manifest tests #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion fpm.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ copyright = "2020 fpm contributors"
[dependencies]
[dependencies.toml-f]
git = "https://github.com/toml-f/toml-f"
rev = "e49f5523e4ee67db6628618864504448fb8c8939"
rev = "aee54c5a480d623af99828c76df0447a15ce90dc"

[dependencies.M_CLI2]
git = "https://github.com/urbanjost/M_CLI2.git"
Expand Down
60 changes: 30 additions & 30 deletions test/fpm_test/test_manifest.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,8 @@ subroutine test_dependency_pathtag(error)

call new_table(table)
table%key = 'example'
call set_value(table, 'path', '"package"', stat)
call set_value(table, 'tag', '"v20.1"', stat)
call set_value(table, 'path', 'package', stat)
call set_value(table, 'tag', 'v20.1', stat)

call new_dependency(dependency, table, error=error)

Expand All @@ -298,7 +298,7 @@ subroutine test_dependency_nourl(error)

call new_table(table)
table%key = 'example'
call set_value(table, 'tag', '"v20.1"', stat)
call set_value(table, 'tag', 'v20.1', stat)

call new_dependency(dependency, table, error=error)

Expand All @@ -319,8 +319,8 @@ subroutine test_dependency_gitpath(error)

call new_table(table)
table%key = 'example'
call set_value(table, 'path', '"package"', stat)
call set_value(table, 'git', '"https://gitea.com/fortran-lang/pack"', stat)
call set_value(table, 'path', 'package', stat)
call set_value(table, 'git', 'https://gitea.com/fortran-lang/pack', stat)

call new_dependency(dependency, table, error=error)

Expand All @@ -341,9 +341,9 @@ subroutine test_dependency_gitconflict(error)

call new_table(table)
table%key = 'example'
call set_value(table, 'git', '"https://gitea.com/fortran-lang/pack"', stat)
call set_value(table, 'branch', '"latest"', stat)
call set_value(table, 'tag', '"v20.1"', stat)
call set_value(table, 'git', 'https://gitea.com/fortran-lang/pack', stat)
call set_value(table, 'branch', 'latest', stat)
call set_value(table, 'tag', 'v20.1', stat)

call new_dependency(dependency, table, error=error)

Expand All @@ -364,7 +364,7 @@ subroutine test_dependency_wrongkey(error)

call new_table(table)
table%key = 'example'
call set_value(table, 'not-available', '"anywhere"', stat)
call set_value(table, 'not-available', 'anywhere', stat)

call new_dependency(dependency, table, error=error)

Expand Down Expand Up @@ -761,23 +761,23 @@ subroutine test_package_simple(error)
type(package_config_t) :: package

call new_table(table)
call set_value(table, 'name', '"example"', stat)
call set_value(table, 'license', '"MIT"', stat)
call set_value(table, 'name', 'example', stat)
call set_value(table, 'license', 'MIT', stat)
call add_table(table, 'dev-dependencies', child, stat)
call add_table(child, 'pkg1', child2, stat)
call set_value(child2, 'git', '"https://github.com/fortran-lang/pkg1"', stat)
call set_value(child2, 'git', 'https://github.com/fortran-lang/pkg1', stat)
call add_table(child, 'pkg2', child2)
call set_value(child2, 'git', '"https://gitlab.com/fortran-lang/pkg2"', stat)
call set_value(child2, 'branch', '"devel"', stat)
call set_value(child2, 'git', 'https://gitlab.com/fortran-lang/pkg2', stat)
call set_value(child2, 'branch', 'devel', stat)
call add_table(child, 'pkg3', child2)
call set_value(child2, 'git', '"https://bitbucket.org/fortran-lang/pkg3"', stat)
call set_value(child2, 'rev', '"9fceb02d0ae598e95dc970b74767f19372d61af8"', stat)
call set_value(child2, 'git', 'https://bitbucket.org/fortran-lang/pkg3', stat)
call set_value(child2, 'rev', '9fceb02d0ae598e95dc970b74767f19372d61af8', stat)
call add_table(child, 'pkg4', child2)
call set_value(child2, 'git', '"https://gitea.com/fortran-lang/pkg4"', stat)
call set_value(child2, 'tag', '"v1.8.5-rc3"', stat)
call set_value(child2, 'git', 'https://gitea.com/fortran-lang/pkg4', stat)
call set_value(child2, 'tag', 'v1.8.5-rc3', stat)
call add_array(table, 'test', children, stat)
call add_table(children, child, stat)
call set_value(child, 'name', '"tester"', stat)
call set_value(child, 'name', 'tester', stat)

call new_package(package, table, error=error)

Expand Down Expand Up @@ -860,7 +860,7 @@ subroutine test_package_wrongexe(error)
type(package_config_t) :: package

call new_table(table)
call set_value(table, 'name', '"example"', stat)
call set_value(table, 'name', 'example', stat)
call add_array(table, 'executable', children, stat)
call add_array(children, children2, stat)

Expand All @@ -883,7 +883,7 @@ subroutine test_package_wrongtest(error)
type(package_config_t) :: package

call new_table(table)
call set_value(table, 'name', '"example"', stat)
call set_value(table, 'name', 'example', stat)
call add_array(table, 'test', children, stat)
call add_array(children, children2, stat)

Expand All @@ -907,12 +907,12 @@ subroutine test_package_duplicate(error)
type(package_config_t) :: package

table = toml_table()
call set_value(table, 'name', '"example"', stat)
call set_value(table, 'name', 'example', stat)
call add_array(table, 'test', children, stat)
call add_table(children, child, stat)
call set_value(child, 'name', '"prog"', stat)
call set_value(child, 'name', 'prog', stat)
call add_table(children, child, stat)
call set_value(child, 'name', '"prog"', stat)
call set_value(child, 'name', 'prog', stat)

call new_package(package, table, error=error)

Expand All @@ -933,9 +933,9 @@ subroutine test_test_simple(error)
type(test_config_t) :: test

call new_table(table)
call set_value(table, 'name', '"example"', stat)
call set_value(table, 'source-dir', '"tests"', stat)
call set_value(table, 'main', '"tester.f90"', stat)
call set_value(table, 'name', 'example', stat)
call set_value(table, 'source-dir', 'tests', stat)
call set_value(table, 'main', 'tester.f90', stat)
call add_table(table, 'dependencies', child, stat)

call new_test(test, table, error)
Expand Down Expand Up @@ -1042,9 +1042,9 @@ subroutine test_example_simple(error)
type(example_config_t) :: example

call new_table(table)
call set_value(table, 'name', '"example"', stat)
call set_value(table, 'source-dir', '"demos"', stat)
call set_value(table, 'main', '"demo.f90"', stat)
call set_value(table, 'name', 'example', stat)
call set_value(table, 'source-dir', 'demos', stat)
call set_value(table, 'main', 'demo.f90', stat)
call add_table(table, 'dependencies', child, stat)

call new_example(example, table, error)
Expand Down