diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/doc/install.texi | 7 | ||||
| -rw-r--r-- | gcc/testsuite/lib/scansarif.exp | 8 | ||||
| -rw-r--r-- | gcc/testsuite/lib/target-supports.exp | 6 |
3 files changed, 11 insertions, 10 deletions
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 0c76916..b545699 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -461,9 +461,10 @@ is shown below: @code{gcov}, @code{gzip}, @code{json}, @code{os} and @code{pytest}. @item SARIF testsuite -Tests of SARIF output will use the @code{jsonschema} program from the -@code{jsonschema} module (if available) to validate generated .sarif files. -If this tool is not found, the validation parts of those tests are skipped. +Tests of SARIF output will use the @code{check-jsonschema} program from +the @code{check-jsonschema} module (if available) to validate generated +.sarif files. If this tool is not found, the validation parts of those +tests are skipped. @item c++ cxx api generation @code{csv}, @code{os}, @code{sys} and @code{time}. diff --git a/gcc/testsuite/lib/scansarif.exp b/gcc/testsuite/lib/scansarif.exp index 3eb38b8..cc0890e 100644 --- a/gcc/testsuite/lib/scansarif.exp +++ b/gcc/testsuite/lib/scansarif.exp @@ -57,7 +57,7 @@ proc scan-sarif-file-not { args } { # Assuming python3 is available, use verify-sarif-file.py to check # that the .sarif file is UTF-8 encoded and is parseable as JSON. # -# Assuming "jsonschema" is available, use it to verify that the .sarif +# Assuming "check-jsonschema" is available, use it to verify that the .sarif # file complies with the SARIF schema. proc verify-sarif-file { args } { @@ -86,8 +86,8 @@ proc verify-sarif-file { args } { # Verify that the file complies with the SARIF schema. # Check that jsonschema is installed. - if { ![check_effective_target_jsonschema] } { - unsupported "$testcase verify-sarif-file: jsonschema is missing" + if { ![check_effective_target_check_jsonschema] } { + unsupported "$testcase verify-sarif-file: check-jsonschema is missing" return } @@ -95,7 +95,7 @@ proc verify-sarif-file { args } { verbose "schema_file: $schema_file" 2 set what "$testcase (test .sarif output against SARIF schema)" - if [catch {exec jsonschema --instance $output_file $schema_file} res ] { + if [catch {exec check-jsonschema --schemafile $schema_file $output_file} res ] { verbose "verify-sarif-file: res: $res" 2 fail "$what" return diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index 47ef8f4..b7df615 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -13594,10 +13594,10 @@ proc check_effective_target_heap_trampoline {} { return 0 } -# Return 1 if jsonschema is available. +# Return 1 if check-jsonschema is available. -proc check_effective_target_jsonschema { } { - set result [remote_exec host "jsonschema --version"] +proc check_effective_target_check_jsonschema { } { + set result [remote_exec host "check-jsonschema --version"] set status [lindex $result 0] if { $status == 0 } then { return 1; |