Kotlin: Tweak custom_plugin/diagnostics test

Author: igfoo

java/ql/integration-tests/linux-only/kotlin/custom_plugin/diagnostics.expected

@@ -1,2 +1,3 @@
 | CodeQL Kotlin extractor | 2 |  | IrProperty without a getter | d.kt:0:0:0:0 | d.kt:0:0:0:0 |
-| CodeQL Kotlin extractor | 2 |  | Not rewriting trap file for: Boolean -1.0-0- -1.0-0-null test-db/trap/java/classes/kotlin/Boolean.members.trap.gz | file://:0:0:0:0 | file://:0:0:0:0 |
+| CodeQL Kotlin extractor | 2 |  | Not rewriting trap file for test-db/trap/java/classes/java/lang/Boolean.members<VERSION>-<MODIFIED>-kotlin.trap.gz as it exists | file://:0:0:0:0 | file://:0:0:0:0 |
+| CodeQL Kotlin extractor | 2 |  | Not rewriting trap file for test-db/trap/java/classes/kotlin/Boolean.members<VERSION>-<MODIFIED>-null.trap.gz as it exists | file://:0:0:0:0 | file://:0:0:0:0 |

java/ql/integration-tests/linux-only/kotlin/custom_plugin/diagnostics.ql

@@ -1,13 +1,14 @@
 import java
 
-from string genBy, int severity, string tag, string msg, Location l
+from string genBy, int severity, string tag, string msg, string msg2, Location l
 where
   diagnostics(_, genBy, severity, tag, msg, _, l) and
   (
     // Different installations get different sets of these messages,
     // so we filter out all but one that happens everywhere.
-    msg.matches("Not rewriting trap file for: %")
+    msg.matches("Not rewriting trap file for %")
     implies
-    msg.matches("Not rewriting trap file for: Boolean %")
-  )
-select genBy, severity, tag, msg, l
+    msg.matches("Not rewriting trap file for %Boolean.members%")
+  ) and
+  msg2 = msg.regexpReplaceAll("#-?[0-9]+\\.-?[0-9]+--?[0-9]+-", "<VERSION>-<MODIFIED>-")
+select genBy, severity, tag, msg2, l