Skip to content

Commit 9640770

Browse files
authored
Do not pass in quotes in manifest tests (#806)
Closes #805
1 parent e781a77 commit 9640770

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

fpm.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ copyright = "2020 fpm contributors"
88
[dependencies]
99
[dependencies.toml-f]
1010
git = "https://github.com/toml-f/toml-f"
11-
rev = "e49f5523e4ee67db6628618864504448fb8c8939"
11+
rev = "aee54c5a480d623af99828c76df0447a15ce90dc"
1212

1313
[dependencies.M_CLI2]
1414
git = "https://github.com/urbanjost/M_CLI2.git"

test/fpm_test/test_manifest.f90

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,8 @@ subroutine test_dependency_pathtag(error)
276276

277277
call new_table(table)
278278
table%key = 'example'
279-
call set_value(table, 'path', '"package"', stat)
280-
call set_value(table, 'tag', '"v20.1"', stat)
279+
call set_value(table, 'path', 'package', stat)
280+
call set_value(table, 'tag', 'v20.1', stat)
281281

282282
call new_dependency(dependency, table, error=error)
283283

@@ -298,7 +298,7 @@ subroutine test_dependency_nourl(error)
298298

299299
call new_table(table)
300300
table%key = 'example'
301-
call set_value(table, 'tag', '"v20.1"', stat)
301+
call set_value(table, 'tag', 'v20.1', stat)
302302

303303
call new_dependency(dependency, table, error=error)
304304

@@ -319,8 +319,8 @@ subroutine test_dependency_gitpath(error)
319319

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

325325
call new_dependency(dependency, table, error=error)
326326

@@ -341,9 +341,9 @@ subroutine test_dependency_gitconflict(error)
341341

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

348348
call new_dependency(dependency, table, error=error)
349349

@@ -364,7 +364,7 @@ subroutine test_dependency_wrongkey(error)
364364

365365
call new_table(table)
366366
table%key = 'example'
367-
call set_value(table, 'not-available', '"anywhere"', stat)
367+
call set_value(table, 'not-available', 'anywhere', stat)
368368

369369
call new_dependency(dependency, table, error=error)
370370

@@ -761,23 +761,23 @@ subroutine test_package_simple(error)
761761
type(package_config_t) :: package
762762

763763
call new_table(table)
764-
call set_value(table, 'name', '"example"', stat)
765-
call set_value(table, 'license', '"MIT"', stat)
764+
call set_value(table, 'name', 'example', stat)
765+
call set_value(table, 'license', 'MIT', stat)
766766
call add_table(table, 'dev-dependencies', child, stat)
767767
call add_table(child, 'pkg1', child2, stat)
768-
call set_value(child2, 'git', '"https://github.com/fortran-lang/pkg1"', stat)
768+
call set_value(child2, 'git', 'https://github.com/fortran-lang/pkg1', stat)
769769
call add_table(child, 'pkg2', child2)
770-
call set_value(child2, 'git', '"https://gitlab.com/fortran-lang/pkg2"', stat)
771-
call set_value(child2, 'branch', '"devel"', stat)
770+
call set_value(child2, 'git', 'https://gitlab.com/fortran-lang/pkg2', stat)
771+
call set_value(child2, 'branch', 'devel', stat)
772772
call add_table(child, 'pkg3', child2)
773-
call set_value(child2, 'git', '"https://bitbucket.org/fortran-lang/pkg3"', stat)
774-
call set_value(child2, 'rev', '"9fceb02d0ae598e95dc970b74767f19372d61af8"', stat)
773+
call set_value(child2, 'git', 'https://bitbucket.org/fortran-lang/pkg3', stat)
774+
call set_value(child2, 'rev', '9fceb02d0ae598e95dc970b74767f19372d61af8', stat)
775775
call add_table(child, 'pkg4', child2)
776-
call set_value(child2, 'git', '"https://gitea.com/fortran-lang/pkg4"', stat)
777-
call set_value(child2, 'tag', '"v1.8.5-rc3"', stat)
776+
call set_value(child2, 'git', 'https://gitea.com/fortran-lang/pkg4', stat)
777+
call set_value(child2, 'tag', 'v1.8.5-rc3', stat)
778778
call add_array(table, 'test', children, stat)
779779
call add_table(children, child, stat)
780-
call set_value(child, 'name', '"tester"', stat)
780+
call set_value(child, 'name', 'tester', stat)
781781

782782
call new_package(package, table, error=error)
783783

@@ -860,7 +860,7 @@ subroutine test_package_wrongexe(error)
860860
type(package_config_t) :: package
861861

862862
call new_table(table)
863-
call set_value(table, 'name', '"example"', stat)
863+
call set_value(table, 'name', 'example', stat)
864864
call add_array(table, 'executable', children, stat)
865865
call add_array(children, children2, stat)
866866

@@ -883,7 +883,7 @@ subroutine test_package_wrongtest(error)
883883
type(package_config_t) :: package
884884

885885
call new_table(table)
886-
call set_value(table, 'name', '"example"', stat)
886+
call set_value(table, 'name', 'example', stat)
887887
call add_array(table, 'test', children, stat)
888888
call add_array(children, children2, stat)
889889

@@ -907,12 +907,12 @@ subroutine test_package_duplicate(error)
907907
type(package_config_t) :: package
908908

909909
table = toml_table()
910-
call set_value(table, 'name', '"example"', stat)
910+
call set_value(table, 'name', 'example', stat)
911911
call add_array(table, 'test', children, stat)
912912
call add_table(children, child, stat)
913-
call set_value(child, 'name', '"prog"', stat)
913+
call set_value(child, 'name', 'prog', stat)
914914
call add_table(children, child, stat)
915-
call set_value(child, 'name', '"prog"', stat)
915+
call set_value(child, 'name', 'prog', stat)
916916

917917
call new_package(package, table, error=error)
918918

@@ -933,9 +933,9 @@ subroutine test_test_simple(error)
933933
type(test_config_t) :: test
934934

935935
call new_table(table)
936-
call set_value(table, 'name', '"example"', stat)
937-
call set_value(table, 'source-dir', '"tests"', stat)
938-
call set_value(table, 'main', '"tester.f90"', stat)
936+
call set_value(table, 'name', 'example', stat)
937+
call set_value(table, 'source-dir', 'tests', stat)
938+
call set_value(table, 'main', 'tester.f90', stat)
939939
call add_table(table, 'dependencies', child, stat)
940940

941941
call new_test(test, table, error)
@@ -1042,9 +1042,9 @@ subroutine test_example_simple(error)
10421042
type(example_config_t) :: example
10431043

10441044
call new_table(table)
1045-
call set_value(table, 'name', '"example"', stat)
1046-
call set_value(table, 'source-dir', '"demos"', stat)
1047-
call set_value(table, 'main', '"demo.f90"', stat)
1045+
call set_value(table, 'name', 'example', stat)
1046+
call set_value(table, 'source-dir', 'demos', stat)
1047+
call set_value(table, 'main', 'demo.f90', stat)
10481048
call add_table(table, 'dependencies', child, stat)
10491049

10501050
call new_example(example, table, error)

0 commit comments

Comments
 (0)