<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/d1b811767535816255194de391586b61ba4c57bd">https://github.com/macports/macports-base/commit/d1b811767535816255194de391586b61ba4c57bd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d1b811767535816255194de391586b61ba4c57bd
</span>Author: Paul Guyot <pguyot@kallisys.net>
AuthorDate: Sat Nov 23 06:53:05 2024 +0100
<span style='display:block; white-space:pre;color:#404040;'> Do not lint platforms for default on subports
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The check that platforms isn't equal to darwin is not performed on a subport
</span><span style='display:block; white-space:pre;color:#404040;'> as there is a specific logic for subports.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70997
</span>---
src/port1.0/portlint.tcl | 4 ++--
src/port1.0/tests/portlint.test | 27 +++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portlint.tcl b/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 4eaf6bcdf..9c58b8039 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portlint.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -260,7 +260,7 @@ proc portlint::lint_platforms {platforms} {
</span> set errors [list]
set warnings [list]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global lint_platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global lint_platforms subport name
</span>
foreach platform $platforms {
set platname [lindex $platform 0]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -269,7 +269,7 @@ proc portlint::lint_platforms {platforms} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$platforms eq "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$platforms eq "darwin" && [string equal -nocase $name $subport]} {
</span> lappend warnings "Unnecessary platforms line as darwin is the default"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/tests/portlint.test b/src/port1.0/tests/portlint.test
</span><span style='display:block; white-space:pre;color:#808080;'>index 272a7213d..aa38a6311 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/tests/portlint.test
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/tests/portlint.test
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -649,6 +649,8 @@ test test_lint_platforms_succeeds_with_darwin_freebsd {
</span> Verify that platforms is accepted with darwin freebsd
} -body {
set platforms "darwin freebsd"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set name "test"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set subport "test"
</span> set results [portlint::lint_platforms $platforms]
set err_results [lindex $results 0]
set warn_results [lindex $results 1]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -666,6 +668,8 @@ test test_lint_platforms_succeeds_with_freebsd {
</span> Verify that platforms is accepted with freebsd
} -body {
set platforms "freebsd"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set name "test"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set subport "test"
</span> set results [portlint::lint_platforms $platforms]
set err_results [lindex $results 0]
set warn_results [lindex $results 1]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -683,6 +687,8 @@ test test_lint_platforms_fails_with_msdos {
</span> Verify that platforms fails with msdos as this is unknown
} -body {
set platforms "msdos"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set name "test"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set subport "test"
</span> set results [portlint::lint_platforms $platforms]
set err_results [lindex $results 0]
set warn_results [lindex $results 1]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -700,6 +706,8 @@ test test_lint_platforms_fails_with_darwin {
</span> Verify that platforms fails with darwin as this is the default
} -body {
set platforms "darwin"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set name "test"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set subport "test"
</span> set results [portlint::lint_platforms $platforms]
set err_results [lindex $results 0]
set warn_results [lindex $results 1]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -713,4 +721,23 @@ test test_lint_platforms_fails_with_darwin {
</span> return "lint_platforms_darwin_fails passed"
} -result "lint_platforms_darwin_fails passed"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+test test_lint_platforms_succeeds_with_subports {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Verify that platforms succeeds with subports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} -body {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set platforms "darwin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set name "test"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set subport "subport"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set results [portlint::lint_platforms $platforms]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set err_results [lindex $results 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set warn_results [lindex $results 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[llength $warn_results] > 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: unexpected error results"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[llength $err_results] > 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "FAIL: unexpected error results"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "test_lint_platforms_succeeds_with_subports passed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} -result "test_lint_platforms_succeeds_with_subports passed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> cleanupTests
</pre><pre style='margin:0'>
</pre>