Updated metadata tests to match new line numbers.

zeroc-ice · Oct 30, 2024 · 7f989a4 · 7f989a4
1 parent ec5bcbb
commit 7f989a4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/cpp/src/slice2swift/SwiftUtil.h b/cpp/src/slice2swift/SwiftUtil.h
@@ -159,7 +159,7 @@ namespace Slice
             bool shouldVisitIncludedDefinitions() const final { return true; }
 
         private:
-            MetadataList validate(const SyntaxTreeBasePtr&, const MetadataList&, const std::string&, int);
+            MetadataList validate(const SyntaxTreeBasePtr&, const ContainedPtr&);
 
             typedef std::map<std::string, std::string> ModuleMap;
             typedef std::map<std::string, ModuleMap> ModulePrefix;

diff --git a/cpp/test/Slice/errorDetection/ConstDef.err b/cpp/test/Slice/errorDetection/ConstDef.err
@@ -22,7 +22,7 @@ ConstDef.ice:118: initializer `256' for constant `b4' out of range for type byte
 ConstDef.ice:130: initializer `32767' for constant `c5' out of range for type byte
 ConstDef.ice:131: initializer `2147483647' for constant `c6' out of range for type short
 ConstDef.ice:132: initializer `9223372036854775807' for constant `c7' out of range for type int
-ConstDef.ice:143: warning: unknown escape sequence in string literal: `\g'
+ConstDef.ice:143: warning: unknown escape sequence in string literal: '\g'
 ConstDef.ice:144: unknown escape sequence in string literal: `\u000N'
 ConstDef.ice:145: unknown escape sequence in string literal: `\U0000000K'
 ConstDef.ice:146: octal escape sequence out of range: `\455'

diff --git a/cpp/test/Slice/errorDetection/WarningInvalidMetadata.err b/cpp/test/Slice/errorDetection/WarningInvalidMetadata.err
@@ -1,21 +1,21 @@
-WarningInvalidMetadata.ice: warning: ignoring invalid file metadata 'cpp:header-ext:hh': directive can appear only once per file
-WarningInvalidMetadata.ice: warning: ignoring invalid file metadata 'cpp:source-ext:cc': directive can appear only once per file
-WarningInvalidMetadata.ice: warning: ignoring invalid file metadata 'cpp:dll-export:Test': directive can appear only once per file
-WarningInvalidMetadata.ice: warning: ignoring invalid file metadata 'cpp:header-ext'
-WarningInvalidMetadata.ice: warning: ignoring invalid file metadata 'cpp:header-ext'
-WarningInvalidMetadata.ice: warning: ignoring invalid file metadata 'cpp:source-ext'
-WarningInvalidMetadata.ice: warning: ignoring invalid file metadata 'cpp:source-ext'
-WarningInvalidMetadata.ice: warning: ignoring invalid file metadata 'cpp:dll-export'
-WarningInvalidMetadata.ice: warning: ignoring invalid file metadata 'cpp:dll-export'
-WarningInvalidMetadata.ice: warning: ignoring invalid file metadata 'cpp:include'
-WarningInvalidMetadata.ice: warning: ignoring invalid file metadata 'cpp:include'
-WarningInvalidMetadata.ice:35: warning: ignoring invalid metadata 'cpp:type:std::list<::std::string>' for operation with void return type
-WarningInvalidMetadata.ice:38: warning: ignoring invalid metadata 'cpp:array' for operation with void return type
+WarningInvalidMetadata.ice:6: warning: ignoring invalid file metadata 'cpp:header-ext:hh': directive can appear only once per file
+WarningInvalidMetadata.ice:9: warning: ignoring invalid file metadata 'cpp:source-ext:cc': directive can appear only once per file
+WarningInvalidMetadata.ice:12: warning: ignoring invalid file metadata 'cpp:dll-export:Test': directive can appear only once per file
+WarningInvalidMetadata.ice:14: warning: ignoring invalid file metadata 'cpp:header-ext'
+WarningInvalidMetadata.ice:15: warning: ignoring invalid file metadata 'cpp:header-ext'
+WarningInvalidMetadata.ice:17: warning: ignoring invalid file metadata 'cpp:source-ext'
+WarningInvalidMetadata.ice:18: warning: ignoring invalid file metadata 'cpp:source-ext'
+WarningInvalidMetadata.ice:20: warning: ignoring invalid file metadata 'cpp:dll-export'
+WarningInvalidMetadata.ice:21: warning: ignoring invalid file metadata 'cpp:dll-export'
+WarningInvalidMetadata.ice:23: warning: ignoring invalid file metadata 'cpp:include'
+WarningInvalidMetadata.ice:24: warning: ignoring invalid file metadata 'cpp:include'
+WarningInvalidMetadata.ice:34: warning: ignoring invalid metadata 'cpp:type:std::list<::std::string>' for operation with void return type
+WarningInvalidMetadata.ice:37: warning: ignoring invalid metadata 'cpp:array' for operation with void return type
 WarningInvalidMetadata.ice:40: warning: ignoring invalid metadata 'cpp:type:my_string'
 WarningInvalidMetadata.ice:42: warning: ignoring invalid metadata 'cpp:view-type:my_string'
-WarningInvalidMetadata.ice:47: warning: ignoring invalid metadata 'cpp:const'
-WarningInvalidMetadata.ice:47: warning: ignoring invalid metadata 'cpp:ice_print'
-WarningInvalidMetadata.ice:53: warning: ignoring invalid metadata 'cpp:virtual'
-WarningInvalidMetadata.ice:58: warning: ignoring invalid metadata 'cpp:bad'
-WarningInvalidMetadata.ice:63: warning: ignoring invalid metadata 'cpp98:foo'
-WarningInvalidMetadata.ice:63: warning: ignoring invalid metadata 'cpp11:bar'
+WarningInvalidMetadata.ice:45: warning: ignoring invalid metadata 'cpp:const'
+WarningInvalidMetadata.ice:45: warning: ignoring invalid metadata 'cpp:ice_print'
+WarningInvalidMetadata.ice:51: warning: ignoring invalid metadata 'cpp:virtual'
+WarningInvalidMetadata.ice:56: warning: ignoring invalid metadata 'cpp:bad'
+WarningInvalidMetadata.ice:61: warning: ignoring invalid metadata 'cpp98:foo'
+WarningInvalidMetadata.ice:61: warning: ignoring invalid metadata 'cpp11:bar'