r363788 - [analyzer][NFC][tests] Pre-normalize expected-sarif files

[Hubert Tong via cfe-commits]

Author: hubert.reinterpretcast
Date: Wed Jun 19 04:19:51 2019
New Revision: 363788

URL: http://llvm.org/viewvc/llvm-project?rev=363788&view=rev
Log:
[analyzer][NFC][tests] Pre-normalize expected-sarif files

As discussed in the review for D62952, this patch pre-normalizes the
reference expected output sarif files by removing lines containing
fields for which we expect differences that should be ignored.

Modified:
    cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-diagnostics-taint-test.c.sarif
    cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-multi-diagnostic-test.c.sarif

Modified: cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-diagnostics-taint-test.c.sarif
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-diagnostics-taint-test.c.sarif?rev=363788&r1=363787&r2=363788&view=diff
==============================================================================
--- cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-diagnostics-taint-test.c.sarif (original)
+++ cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-diagnostics-taint-test.c.sarif Wed Jun 19 04:19:51 2019
@@ -5,7 +5,6 @@
       "files": [
         {
           "fileLocation": {
-            "uri": "file:sarif-diagnostics-taint-test.c"
           },
           "length": 415,
           "mimeType": "text/plain",
@@ -43,7 +42,6 @@
                         "physicalLocation": {
                           "fileLocation": {
                             "fileIndex": 0,
-                            "uri": "file:sarif-diagnostics-taint-test.c"
                           },
                           "region": {
                             "endColumn": 5,
@@ -63,7 +61,6 @@
                         "physicalLocation": {
                           "fileLocation": {
                             "fileIndex": 0,
-                            "uri": "file:sarif-diagnostics-taint-test.c"
                           },
                           "region": {
                             "endColumn": 17,
@@ -84,7 +81,6 @@
               "physicalLocation": {
                 "fileLocation": {
                   "fileIndex": 0,
-                  "uri": "file:sarif-diagnostics-taint-test.c"
                 },
                 "region": {
                   "endColumn": 17,
@@ -106,9 +102,7 @@
         "fullName": "clang static analyzer",
         "language": "en-US",
         "name": "clang",
-        "version": "clang version 8.0.0"
       }
     }
   ],
-  "version": "2.0.0-csd.2.beta.2018-11-28"
 }

Modified: cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-multi-diagnostic-test.c.sarif
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-multi-diagnostic-test.c.sarif?rev=363788&r1=363787&r2=363788&view=diff
==============================================================================
--- cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-multi-diagnostic-test.c.sarif (original)
+++ cfe/trunk/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-multi-diagnostic-test.c.sarif Wed Jun 19 04:19:51 2019
@@ -5,7 +5,6 @@
       "files": [      
         {
           "fileLocation": {
-            "uri": "file:sarif-multi-diagnostic-test.c"
           },
           "length": 667,
           "mimeType": "text/plain",
@@ -63,7 +62,6 @@
                         "physicalLocation": {
                           "fileLocation": {
                             "fileIndex": 0,
-                            "uri": "file:sarif-multi-diagnostic-test.c"
                           },
                           "region": {
                             "endColumn": 5,
@@ -83,7 +81,6 @@
                         "physicalLocation": {
                           "fileLocation": {
                             "fileIndex": 0,
-                            "uri": "file:sarif-multi-diagnostic-test.c"
                           },
                           "region": {
                             "endColumn": 17,
@@ -104,7 +101,6 @@
               "physicalLocation": {
                 "fileLocation": {
                   "fileIndex": 0,
-                  "uri": "file:sarif-multi-diagnostic-test.c"
                 },
                 "region": {
                   "endColumn": 17,
@@ -136,7 +132,6 @@
                         "physicalLocation": {
                           "fileLocation": {
                             "fileIndex": 0,
-                            "uri": "file:sarif-multi-diagnostic-test.c"
                           },
                           "region": {
                             "endColumn": 5,
@@ -156,7 +151,6 @@
                         "physicalLocation": {
                           "fileLocation": {
                             "fileIndex": 0,
-                            "uri": "file:sarif-multi-diagnostic-test.c"
                           },
                           "region": {
                             "endColumn": 10,
@@ -176,7 +170,6 @@
                         "physicalLocation": {
                           "fileLocation": {
                             "fileIndex": 0,
-                            "uri": "file:sarif-multi-diagnostic-test.c"
                           },
                           "region": {
                             "endColumn": 8,
@@ -197,7 +190,6 @@
               "physicalLocation": {
                 "fileLocation": {
                   "fileIndex": 0,
-                  "uri": "file:sarif-multi-diagnostic-test.c"
                 },
                 "region": {
                   "endColumn": 8,
@@ -229,7 +221,6 @@
                         "physicalLocation": {
                           "fileLocation": {
                             "fileIndex": 0,
-                            "uri": "file:sarif-multi-diagnostic-test.c"
                           },
                           "region": {
                             "endColumn": 12,
@@ -249,7 +240,6 @@
                         "physicalLocation": {
                           "fileLocation": {
                             "fileIndex": 0,
-                            "uri": "file:sarif-multi-diagnostic-test.c"
                           },
                           "region": {
                             "endColumn": 3,
@@ -269,7 +259,6 @@
                         "physicalLocation": {
                           "fileLocation": {
                             "fileIndex": 0,
-                            "uri": "file:sarif-multi-diagnostic-test.c"
                           },
                           "region": {
                             "endColumn": 14,
@@ -290,7 +279,6 @@
               "physicalLocation": {
                 "fileLocation": {
                   "fileIndex": 0,
-                  "uri": "file:sarif-multi-diagnostic-test.c"
                 },
                 "region": {
                   "endColumn": 14,
@@ -312,9 +300,7 @@
         "fullName": "clang static analyzer",
         "language": "en-US",
         "name": "clang",
-        "version": "clang version 8.0.0 (trunk 345822) (llvm/trunk 345824)"
       }
     }
   ],
-  "version": "2.0.0-csd.2.beta.2018-11-28"
 }