From 8b3b3f088700ce0270932762855978f2fec1584c Mon Sep 17 00:00:00 2001 From: "John S. Urban" Date: Fri, 9 Jul 2021 16:03:46 -0400 Subject: remove # from tests --- src/fpm/manifest/example.f90 | 2 +- src/fpm/manifest/executable.f90 | 2 +- src/fpm/manifest/package.f90 | 2 +- src/fpm/manifest/test.f90 | 2 +- test/fpm_test/test_manifest.f90 | 4 ++-- test/fpm_test/test_toml.f90 | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/fpm/manifest/example.f90 b/src/fpm/manifest/example.f90 index caf1e1e..56f64c8 100644 --- a/src/fpm/manifest/example.f90 +++ b/src/fpm/manifest/example.f90 @@ -64,7 +64,7 @@ contains end if if(.not.is_fortran_name(to_fortran_name(self%name)))then call syntax_error(error, 'manifest file syntax error: example name must be composed only of & - &alphanumerics, "-" and "_" and start with a letter') + &alphanumerics, "-" and "_" and start with a letter::'//self%name) return endif call get_value(table, "source-dir", self%source_dir, "example") diff --git a/src/fpm/manifest/executable.f90 b/src/fpm/manifest/executable.f90 index d376263..9447687 100644 --- a/src/fpm/manifest/executable.f90 +++ b/src/fpm/manifest/executable.f90 @@ -74,7 +74,7 @@ contains end if if(.not.is_fortran_name(to_fortran_name(self%name)))then call syntax_error(error, 'manifest file syntax error: executable name must be composed only of & - &alphanumerics, "-" and "_" and start with a letter') + &alphanumerics, "-" and "_" and start with a letter::'//self%name) return endif call get_value(table, "source-dir", self%source_dir, "app") diff --git a/src/fpm/manifest/package.f90 b/src/fpm/manifest/package.f90 index 0150553..fd5e873 100644 --- a/src/fpm/manifest/package.f90 +++ b/src/fpm/manifest/package.f90 @@ -134,7 +134,7 @@ contains end if if(.not.is_fortran_name(to_fortran_name(self%name)))then call syntax_error(error, 'manifest file syntax error: package name must be composed only of & - &alphanumerics, "-" and "_" and start with a letter') + &alphanumerics, "-" and "_" and start with a letter::'//self%name) return endif diff --git a/src/fpm/manifest/test.f90 b/src/fpm/manifest/test.f90 index 9912414..a7e5e88 100644 --- a/src/fpm/manifest/test.f90 +++ b/src/fpm/manifest/test.f90 @@ -64,7 +64,7 @@ contains end if if(.not.is_fortran_name(to_fortran_name(self%name)))then call syntax_error(error, 'manifest file syntax error: test name must be composed only of & - &alphanumerics, "-" and "_" and start with a letter') + &alphanumerics, "-" and "_" and start with a letter ::'//self%name) return endif call get_value(table, "source-dir", self%source_dir, "test") 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'']', & -- cgit v1.2.3