Skip to content

Commit f8aed37

Browse files
committed
remove duplicate tests
1 parent 54a092c commit f8aed37

File tree

4 files changed

+7
-367
lines changed

4 files changed

+7
-367
lines changed

src/fpm/manifest/package.f90

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ module fpm_manifest_package
5959

6060
public :: package_config_t, new_package
6161

62-
63-
64-
6562
!> Package meta data
6663
!> Package configuration data - extends a `feature_config_t` to represent the "default"
6764
!> package feature. The following are now inherited from feature_config_t: name (but for package

src/fpm_environment.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ pure function OS_NAME(os)
8282
case (OS_FREEBSD); OS_NAME = "FreeBSD"
8383
case (OS_OPENBSD); OS_NAME = "OpenBSD"
8484
case (OS_UNKNOWN); OS_NAME = "Unknown"
85-
case (OS_ALL) ; OS_NAME = "All"
85+
case (OS_ALL) ; OS_NAME = "all"
8686
case default ; OS_NAME = "UNKNOWN"
8787
end select
8888
end function OS_NAME
@@ -113,9 +113,9 @@ pure elemental subroutine validate_os_name(os_name, is_valid)
113113
!> Boolean value of whether os_name is valid or not
114114
logical, intent(out) :: is_valid
115115

116-
select case (os_name)
116+
select case (lower(os_name))
117117
case ("linux", "macos", "windows", "cygwin", "solaris", "freebsd", &
118-
& "openbsd", "unknown")
118+
& "openbsd", "all")
119119
is_valid = .true.
120120
case default
121121
is_valid = .false.

src/fpm_model.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ module fpm_model
225225
type(string_t) :: module_prefix
226226

227227
!> Target operating system
228-
integer :: target_os = OS_UNKNOWN
228+
integer :: target_os = OS_ALL
229229

230230
contains
231231

@@ -1101,8 +1101,8 @@ subroutine model_load_from_toml(self, table, error)
11011101
self%target_os = match_os_type(os_string)
11021102

11031103
else
1104-
! Default to current OS if not specified
1105-
self%target_os = get_os_type()
1104+
! Default to ALL OS if not specified
1105+
self%target_os = OS_ALL
11061106
end if
11071107

11081108
end subroutine model_load_from_toml

0 commit comments

Comments
 (0)