manifest: bugfix and test serialization

Author: perazz

src/fpm/manifest/build.f90

@@ -105,9 +105,8 @@ subroutine new_build_config(self, table, package_name, error)
 
         if (stat == toml_stat%success) then
 
-            ! Boolean value found. Set no custom prefix. This also falls back to
-            ! key not provided
-            self%module_prefix = string_t("")
+            ! Boolean value found. Set no custom prefix. This also falls back to key not provided
+            if (allocated(self%module_prefix%s)) deallocate(self%module_prefix%s)
 
         else
 
@@ -306,7 +305,7 @@ subroutine load_from_toml(self, table, error)
         call get_value(table, "module-naming", self%module_naming, .false., stat=stat)
         if (stat == toml_stat%success) then
             ! Boolean value found. Set no custom prefix. This also falls back to key not provided
-            self%module_prefix = string_t("")
+            if (allocated(self%module_prefix%s)) deallocate(self%module_prefix%s)
         else
             !> Value found, but not a boolean. Attempt to read a prefix string
             call get_value(table, "module-naming", self%module_prefix%s)

src/fpm/manifest/install.f90

@@ -17,7 +17,7 @@ module fpm_manifest_install
   type, extends(serializable_t) :: install_config_t
 
     !> Install library with this project
-    logical :: library
+    logical :: library = .false.
 
   contains
 

src/fpm/manifest/package.f90

@@ -611,6 +611,7 @@ subroutine dump_to_toml(self, table, error)
        integer :: ierr, ii
        type(toml_table), pointer :: ptr,ptr_pkg
        character(30) :: unnamed
+       character(128) :: profile_name
 
        call set_string(table, "name", self%name, error, class_name)
        if (allocated(error)) return
@@ -740,14 +741,10 @@ subroutine dump_to_toml(self, table, error)
 
               associate (pkg => self%profiles(ii))
 
-                 !> Because dependencies are named, fallback if this has no name
-                 !> So, serialization will work regardless of size(self%dep) == self%ndep
-                 if (len_trim(pkg%profile_name)==0) then
-                    write(unnamed,1) 'PROFILE',ii
-                    call add_table(ptr_pkg, trim(unnamed), ptr, error, class_name//'(profiles)')
-                 else
-                    call add_table(ptr_pkg, pkg%profile_name, ptr, error, class_name//'(profiles)')
-                 end if
+                 !> Duplicate profile names are possible, as multiple profiles are possible with the
+                 !> same name, same compiler, etc. So, use a unique name here
+                 write(profile_name,1) 'PROFILE',ii
+                 call add_table(ptr_pkg, trim(profile_name), ptr, error, class_name//'(profiles)')
                  if (allocated(error)) return
                  call pkg%dump_to_toml(ptr, error)
                  if (allocated(error)) return

src/fpm/manifest/profiles.f90

@@ -1059,41 +1059,32 @@ logical function profile_same(this,that)
 
           select type (other=>that)
              type is (profile_config_t)
-                print *, 'check name'
                 if (allocated(this%profile_name).neqv.allocated(other%profile_name)) return
                 if (allocated(this%profile_name)) then
                     if (.not.(this%profile_name==other%profile_name)) return
                 endif
-                print *, 'check compiler'
                 if (allocated(this%compiler).neqv.allocated(other%compiler)) return
                 if (allocated(this%compiler)) then
                     if (.not.(this%compiler==other%compiler)) return
                 endif
-                print *, 'check os'
                 if (this%os_type/=other%os_type) return
-                print *, 'check flags'
                 if (allocated(this%flags).neqv.allocated(other%flags)) return
                 if (allocated(this%flags)) then
                     if (.not.(this%flags==other%flags)) return
                 endif
-                print *, 'check cflags'
                 if (allocated(this%c_flags).neqv.allocated(other%c_flags)) return
                 if (allocated(this%c_flags)) then
                     if (.not.(this%c_flags==other%c_flags)) return
                 endif
-                print *, 'check cxxflags'
                 if (allocated(this%cxx_flags).neqv.allocated(other%cxx_flags)) return
                 if (allocated(this%cxx_flags)) then
                     if (.not.(this%cxx_flags==other%cxx_flags)) return
                 endif
-                print *, 'check link'
                 if (allocated(this%link_time_flags).neqv.allocated(other%link_time_flags)) return
                 if (allocated(this%link_time_flags)) then
                     if (.not.(this%link_time_flags==other%link_time_flags)) return
                 endif
 
-                print *, 'check file scope'
-
                 if (allocated(this%file_scope_flags).neqv.allocated(other%file_scope_flags)) return
                 if (allocated(this%file_scope_flags)) then
                     if (.not.size(this%file_scope_flags)==size(other%file_scope_flags)) return
@@ -1103,7 +1094,6 @@ logical function profile_same(this,that)
                     end do
                 endif
 
-                print *, 'check builtin'
                 if (this%is_built_in.neqv.other%is_built_in) return
 
              class default
@@ -1209,7 +1199,6 @@ subroutine profile_load(self, table, error)
         call get_value(table, "profile-name", self%profile_name)
         call get_value(table, "compiler", self%compiler)
         call get_value(table,"os-type",flag)
-        print *, 'OS flag = ',flag
         call match_os_type(flag, self%os_type)
         call get_value(table, "flags", self%flags)
         call get_value(table, "c-flags", self%c_flags)

test/fpm_test/test_manifest.f90

@@ -167,6 +167,10 @@ subroutine test_valid_manifest(error)
             return
         end if
 
+        ! Test package serialization
+        call package%test_serialization('test_valid_manifest',error)
+        if (allocated(error)) return
+
     end subroutine test_valid_manifest
 
 
@@ -220,6 +224,9 @@ subroutine test_default_library(error)
             return
         end if
 
+        call package%test_serialization('test_default_library',error)
+        if (allocated(error)) return
+
     end subroutine test_default_library
 
 
@@ -243,6 +250,9 @@ subroutine test_default_executable(error)
             & "Default executable name")
         if (allocated(error)) return
 
+        call package%test_serialization('test_default_executable',error)
+        if (allocated(error)) return
+
     end subroutine test_default_executable
 
 
@@ -1253,7 +1263,7 @@ subroutine test_link_array(error)
         if (allocated(error)) return
 
         !> Test serialization roundtrip
-        call build%test_serialization('test_link_string', error)
+        call build%test_serialization('test_link_array', error)
         if (allocated(error)) return
 
     end subroutine test_link_array