[tests] Update Oracles

tests/cil/oracle/cpu_a.res.oracle

 [kernel] Parsing cpu_a.c (with preprocessing)
 [kernel] Parsing cpu_b.c (with preprocessing)
-[kernel] cpu_b.c:7: Warning: 
+[kernel:typing:int-conversion] cpu_b.c:7: Warning: 
   Integer compatibily is machine-dependent : unsigned short and unsigned int
-[kernel] Warning: Conflicting definitions are between files cpu_a.c and cpu_b.c
+[kernel:typing:merge-conversion] Warning: 
+  Conflicting definitions are between files cpu_a.c and cpu_b.c
 /* Generated by Frama-C */
 typedef unsigned short DWORD;
 DWORD f(void)

tests/cil/oracle/cpu_b.res.oracle

 [kernel] Parsing cpu_b.c (with preprocessing)
 [kernel] Parsing cpu_a.c (with preprocessing)
-[kernel] cpu_a.c:6: Warning: 
+[kernel:typing:int-conversion] cpu_a.c:6: Warning: 
   Integer compatibily is machine-dependent : unsigned int and unsigned short
-[kernel] Warning: Conflicting definitions are between files cpu_b.c and cpu_a.c
+[kernel:typing:merge-conversion] Warning: 
+  Conflicting definitions are between files cpu_b.c and cpu_a.c
 /* Generated by Frama-C */
 typedef unsigned int DWORD;
 DWORD f(void);

tests/misc/oracle/audit-out.json

@@ -64,7 +64,7 @@
         "typing:implicit-function-declaration",
         "typing:incompatible-pointer-types",
         "typing:incompatible-types-call", "typing:inconsistent-specifier",
-        "typing:int-conversion", "typing:no-proto"
+        "typing:int-conversion", "typing:merge-conversion", "typing:no-proto"
       ],
       "disabled": [
         "CERT:EXP:10", "acsl-float-compare", "c11", "file:not-found",