Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix exclusions for tests of shared queries #308

Merged
merged 6 commits into from
May 19, 2023

Conversation

lcartey
Copy link
Collaborator

@lcartey lcartey commented May 18, 2023

Description

For shared queries we generate a test query, as the shared query library is not directly testable. This generated query simply imported the shared library. For example, for dead code we had the following:

// GENERATED FILE - DO NOT MODIFY
import codingstandards.cpp.rules.deadcode.DeadCode

However, the query uses an abstract class mechanism to implement rule-specific exclusions. Again, for DeadCode.qll we have:

abstract class DeadCodeSharedQuery extends Query { }

Query getQuery() { result instanceof DeadCodeSharedQuery }
...
query predicate problems(Stmt s, string message) {
  not isExcluded(s, getQuery()) and

In this way the queries for specific rules can provide the correct Query instance, so only deviations for that rule will apply for that query.

Our test framework did not opt into this, as it did not extend the DeadCodeSharedQuery. getQuery() is therefore empty, which means no exclusions are applied through the isExcluded predicate.

The fix is to update our code generator to create an extension of the ..SharedQuery using a dummy test query. For example:

class TestFileQuery extends DeadCodeSharedQuery, TestQuery { }

This addresses compiler compatibility test failures marked "Results reported outside the source location" for the following queries:

  • A15-5-3 (qcc, gcc, clang)
  • A25-1-1 (qcc, gcc, clang)
  • A25-4-1 (qcc)
  • CON53-CPP (qcc, gcc, clang)
  • CTR57-CPP (qcc)
  • CTR58-CPP (qcc, gcc, clang)
  • ERR50-CPP (qcc, gcc, clang))

Change request type

  • Release or process automation (GitHub workflows, internal scripts)
  • Internal documentation
  • External documentation
  • Query files (.ql, .qll, .qls or unit tests)
  • External scripts (analysis report or other code shipped as part of a release)

Rules with added or modified queries

  • No rules added
  • Queries have been added for the following rules:
    • rule number here
  • Queries have been modified for the following rules:
    • rule number here

Release change checklist

A change note (development_handbook.md#change-notes) is required for any pull request which modifies:

  • The structure or layout of the release artifacts.
  • The evaluation performance (memory, execution time) of an existing query.
  • The results of an existing query in any circumstance.

If you are only adding new rule queries, a change note is not required.

Author: Is a change note required?

  • Yes
  • No

馃毃馃毃馃毃
Reviewer: Confirm that format of shared queries (not the .qll file, the
.ql file that imports it) is valid by running them within VS Code.

  • Confirmed

Reviewer: Confirm that either a change note is not required or the change note is required and has been added.

  • Confirmed

Query development review checklist

For PRs that add new queries or modify existing queries, the following checklist should be completed by both the author and reviewer:

Author

  • Have all the relevant rule package description files been checked in?
  • Have you verified that the metadata properties of each new query is set appropriately?
  • Do all the unit tests contain both "COMPLIANT" and "NON_COMPLIANT" cases?
  • Are the alert messages properly formatted and consistent with the style guide?
  • Have you run the queries on OpenPilot and verified that the performance and results are acceptable?
    As a rule of thumb, predicates specific to the query should take no more than 1 minute, and for simple queries be under 10 seconds. If this is not the case, this should be highlighted and agreed in the code review process.
  • Does the query have an appropriate level of in-query comments/documentation?
  • Have you considered/identified possible edge cases?
  • Does the query not reinvent features in the standard library?
  • Can the query be simplified further (not golfed!)

Reviewer

  • Have all the relevant rule package description files been checked in?
  • Have you verified that the metadata properties of each new query is set appropriately?
  • Do all the unit tests contain both "COMPLIANT" and "NON_COMPLIANT" cases?
  • Are the alert messages properly formatted and consistent with the style guide?
  • Have you run the queries on OpenPilot and verified that the performance and results are acceptable?
    As a rule of thumb, predicates specific to the query should take no more than 1 minute, and for simple queries be under 10 seconds. If this is not the case, this should be highlighted and agreed in the code review process.
  • Does the query have an appropriate level of in-query comments/documentation?
  • Have you considered/identified possible edge cases?
  • Does the query not reinvent features in the standard library?
  • Can the query be simplified further (not golfed!)

Shared query test files were not excluding elements outside the source
archive because they did not implement the `..SharedQuery` mechanism.
This commit adjusts the `Query` class to provide a dummy query for this
purpose, and updates the generator to create an instance of that
abstract class for each shared query.
Run the updated generator to add ..SharedQuery implementations for each
shared test file.
@lcartey lcartey requested a review from mbaluda May 18, 2023 15:18
Copy link
Contributor

@mbaluda mbaluda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good in the matrix-testing reports

@lcartey lcartey added this pull request to the merge queue May 19, 2023
Merged via the queue into main with commit 738c5b8 May 19, 2023
17 checks passed
@lcartey lcartey deleted the lcartey/shared-query-outside-source-archive branch May 19, 2023 08:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

None yet

2 participants