Merge branch 'kiko/dialyzer/fixes-license-on-test-files/OTP-19434' in…

…to maint * kiko/dialyzer/fixes-license-on-test-files: dialyzer: remove license from expected result OTP-19434
erlang · Jan 16, 2025 · d14f825 · d14f825
2 parents a2c9c99 + 7bf07d3
commit d14f825
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/lib/dialyzer/test/file_utils.erl b/lib/dialyzer/test/file_utils.erl
@@ -151,5 +151,13 @@ file_to_lines(File, Acc) ->
     case io:get_line(File, "") of
 	{error, _}=Error -> Error;
 	eof              -> Acc;
-	A                -> file_to_lines(File, [A|Acc])
+	A                ->
+            case A of
+                "%% SPDX-License-Identifier:"++_ ->
+                    file_to_lines(File, Acc);
+                "%% SPDX-FileCopyrightText:"++_ ->
+                    file_to_lines(File, Acc);
+                _ ->
+                    file_to_lines(File, [A|Acc])
+            end
     end.
diff --git a/lib/dialyzer/test/small_SUITE_data/results/abs b/lib/dialyzer/test/small_SUITE_data/results/abs
@@ -1,3 +1,5 @@
+%% SPDX-License-Identifier: Apache-2.0
+%% SPDX-FileCopyrightText: 2024 Erlang/OTP and its contributors
 
 abs.erl:12:1: Function i1/0 has no local return
 abs.erl:16:5: The pattern 'true' can never match the type 'false'

diff --git a/lib/dialyzer/test/small_SUITE_data/src/abs.erl b/lib/dialyzer/test/small_SUITE_data/src/abs.erl
@@ -76,3 +76,6 @@ int() ->
 
 float() ->
     math:sqrt(1.0).
+
+%% SPDX-License-Identifier: Apache-2.0
+%% SPDX-FileCopyrightText: 2024 Erlang/OTP and its contributors