Skip to content

Commit 8cf7587

Browse files
authored
Merge pull request swiftlang#36589 from HassanElDesouky/remove-unknownIDs-from-tests
[Localization] Remove checking on unknownIDs from tests
2 parents 6207dd8 + 9618461 commit 8cf7587

File tree

3 files changed

+2
-19
lines changed

3 files changed

+2
-19
lines changed

test/diagnostics/Localization/Inputs/en.yaml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,14 @@
1717
#
1818
#===----------------------------------------------------------------------===#
1919

20-
- id: "not_available_in_def"
21-
msg: "Shouldn't be produced"
22-
2320
- id: "lex_unterminated_string"
2421
msg: "unterminated string literal"
2522

26-
- id: "not_available_in_def_2"
27-
msg: "Shouldn't be produced"
28-
2923
- id: "var_init_self_referential"
3024
msg: "variable used within its own initial value"
3125

3226
- id: "cannot_find_in_scope"
3327
msg: "cannot %select{find|find operator}1 %0 in scope"
3428

35-
- id: "not_available_in_def_3"
36-
msg: "Shouldn't be produced"
37-
3829
- id: "warning_invalid_locale_code"
3930
msg: "unsupported locale code; supported locale codes are '%0'"
40-
41-
- id: "not_available_in_def_4"
42-
msg: "Shouldn't be produced"
43-
44-
- id: "not_available_in_def_5"
45-
msg: "Shouldn't be produced"

test/diagnostics/Localization/fr_debug_diagnostic_name.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// RUN: %empty-directory(%t)
22
// RUN: swift-serialize-diagnostics --input-file-path=%S/Inputs/fr.yaml --output-directory=%t/
3-
// RUN: swift-serialize-diagnostics --input-file-path=%S/Inputs/en.yaml --output-directory=%t/ 2>&1 | %FileCheck %s
3+
// RUN: swift-serialize-diagnostics --input-file-path=%S/Inputs/en.yaml --output-directory=%t/
44
// RUN: not %target-swift-frontend -debug-diagnostic-names -localization-path %S/Inputs -locale fr -typecheck %s 2>&1 | %FileCheck %s --check-prefix=CHECK_NAMES
55

6-
// CHECK: These diagnostic IDs are no longer availiable: 'not_available_in_def, not_available_in_def_2, not_available_in_def_3, not_available_in_def_4, not_available_in_def_5'
76
_ = "HI!
87
// CHECK_NAMES: error: chaîne non terminée littérale [lex_unterminated_string]{{$}}
98

test/diagnostics/Localization/fr_localization.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// RUN: %empty-directory(%t)
22
// RUN: swift-serialize-diagnostics --input-file-path=%S/Inputs/fr.yaml --output-directory=%t/
3-
// RUN: swift-serialize-diagnostics --input-file-path=%S/Inputs/en.yaml --output-directory=%t/ 2>&1 | %FileCheck %s
3+
// RUN: swift-serialize-diagnostics --input-file-path=%S/Inputs/en.yaml --output-directory=%t/
44
// RUN: %target-typecheck-verify-swift -localization-path %t -locale fr
55

6-
// CHECK: These diagnostic IDs are no longer availiable: 'not_available_in_def, not_available_in_def_2, not_available_in_def_3, not_available_in_def_4, not_available_in_def_5'
76
_ = "HI!
87
// expected-error@-1{{chaîne non terminée littérale}}
98

0 commit comments

Comments
 (0)