-
Notifications
You must be signed in to change notification settings - Fork 6k
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’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Output selection tests #15447
Merged
+587
−0
Merged
Output selection tests #15447
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
File renamed without changes.
File renamed without changes.
13 changes: 13 additions & 0 deletions
13
.../cmdlineTests/standard_output_selection_all_sources_blank_contract_named_blank/input.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| { | ||
| "language": "Solidity", | ||
| "sources": { | ||
| "": {"content": "contract D {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}, | ||
| "*": {"content": "contract D {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}, | ||
| "C": {"content": "contract D {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"} | ||
| }, | ||
| "settings": { | ||
| "outputSelection": { | ||
| "": {"D": ["userdoc"]} | ||
| } | ||
| } | ||
| } |
24 changes: 24 additions & 0 deletions
24
...cmdlineTests/standard_output_selection_all_sources_blank_contract_named_blank/output.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| { | ||
| "contracts": { | ||
| "": { | ||
| "D": { | ||
| "userdoc": { | ||
| "kind": "user", | ||
| "methods": {}, | ||
| "version": 1 | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "sources": { | ||
| "": { | ||
| "id": 0 | ||
| }, | ||
| "*": { | ||
| "id": 1 | ||
| }, | ||
| "C": { | ||
| "id": 2 | ||
| } | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
13 changes: 13 additions & 0 deletions
13
test/cmdlineTests/standard_output_selection_all_sources_star_contract_named_star/input.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| { | ||
| "language": "Solidity", | ||
| "sources": { | ||
| "": {"content": "contract D {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}, | ||
| "*": {"content": "contract D {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}, | ||
| "C": {"content": "contract D {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"} | ||
| }, | ||
| "settings": { | ||
| "outputSelection": { | ||
| "*": {"D": ["userdoc"]} | ||
| } | ||
| } | ||
| } |
42 changes: 42 additions & 0 deletions
42
test/cmdlineTests/standard_output_selection_all_sources_star_contract_named_star/output.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| { | ||
| "contracts": { | ||
| "": { | ||
| "D": { | ||
| "userdoc": { | ||
| "kind": "user", | ||
| "methods": {}, | ||
| "version": 1 | ||
| } | ||
| } | ||
| }, | ||
| "*": { | ||
| "D": { | ||
| "userdoc": { | ||
| "kind": "user", | ||
| "methods": {}, | ||
| "version": 1 | ||
| } | ||
| } | ||
| }, | ||
| "C": { | ||
| "D": { | ||
| "userdoc": { | ||
| "kind": "user", | ||
| "methods": {}, | ||
| "version": 1 | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "sources": { | ||
| "": { | ||
| "id": 0 | ||
| }, | ||
| "*": { | ||
| "id": 1 | ||
| }, | ||
| "C": { | ||
| "id": 2 | ||
| } | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
29 changes: 29 additions & 0 deletions
29
...sts/standard_output_selection_duplicate_matching_source_and_contract_selectors/input.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| { | ||
| "language": "Solidity", | ||
| "sources": { | ||
| "*": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}, | ||
| "C": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}, | ||
| "D": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"} | ||
| }, | ||
| "settings": { | ||
| "outputSelection": { | ||
| // Outputs from duplicate keys are not combined. Last value wins. | ||
| "*": { | ||
| "*": ["userdoc"], // Ignored | ||
| "*": ["devdoc"] // Ignored | ||
| }, | ||
| "C": { | ||
| "*": ["storageLayout"], // Ignored | ||
| "*": ["transientStorageLayout"] // Ignored | ||
| }, | ||
| "C": { | ||
| "A": ["evm.bytecode.linkReferences"], // Ignored | ||
| "A": ["evm.bytecode.object"] | ||
| }, | ||
| "*": { | ||
| "A": ["evm.deployedBytecode.immutableReferences"], // Ignored | ||
| "A": ["abi"] | ||
| } | ||
| } | ||
| } | ||
| } |
35 changes: 35 additions & 0 deletions
35
...ts/standard_output_selection_duplicate_matching_source_and_contract_selectors/output.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| { | ||
| "contracts": { | ||
| "*": { | ||
| "A": { | ||
| "abi": [] | ||
| } | ||
| }, | ||
| "C": { | ||
| "A": { | ||
| "abi": [], | ||
| "evm": { | ||
| "bytecode": { | ||
| "object": "<BYTECODE REMOVED>" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "D": { | ||
| "A": { | ||
| "abi": [] | ||
| } | ||
| } | ||
| }, | ||
| "sources": { | ||
| "*": { | ||
| "id": 0 | ||
| }, | ||
| "C": { | ||
| "id": 1 | ||
| }, | ||
| "D": { | ||
| "id": 2 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "language": "Solidity", | ||
| "sources": { | ||
| "C": {"content": "contract A {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"} | ||
| }, | ||
| "settings": { | ||
| "outputSelection": {} | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
test/cmdlineTests/standard_output_selection_empty/output.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "sources": { | ||
| "C": { | ||
| "id": 0 | ||
| } | ||
| } | ||
| } |
29 changes: 29 additions & 0 deletions
29
...ests/standard_output_selection_multiple_matching_source_and_contract_selectors/input.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| { | ||
| "language": "Solidity", | ||
| "sources": { | ||
| "": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}, | ||
| "*": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}, | ||
| "C": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}, | ||
| "D": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"} | ||
| }, | ||
| "settings": { | ||
| "outputSelection": { | ||
| // FIXME: Behavior of "" is inconsistent. Sometimes it matches everything, sometimes only empty name. | ||
| "": { | ||
| "": ["metadata"], // No matches | ||
| "*": ["transientStorageLayout"], // All sources, all contracts | ||
| "A": ["abi"] // source "", contract A | ||
| }, | ||
| "*": { | ||
| "": ["evm.deployedBytecode.immutableReferences"], // No matches | ||
| "*": ["evm.bytecode.object"], // All sources, all contracts | ||
| "A": ["evm.bytecode.linkReferences"] // All sources, contract A | ||
| }, | ||
| "C": { | ||
| "": ["userdoc"], // No matches | ||
| "*": ["devdoc"], // All contracts in source "C" | ||
| "A": ["storageLayout"] // source "C", contract A | ||
| } | ||
| } | ||
| } | ||
| } | ||
109 changes: 109 additions & 0 deletions
109
...sts/standard_output_selection_multiple_matching_source_and_contract_selectors/output.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| { | ||
| "contracts": { | ||
| "": { | ||
| "A": { | ||
| "abi": [], | ||
| "evm": { | ||
| "bytecode": { | ||
| "linkReferences": {}, | ||
| "object": "<BYTECODE REMOVED>" | ||
| } | ||
| }, | ||
| "transientStorageLayout": { | ||
| "storage": [], | ||
| "types": null | ||
| } | ||
| }, | ||
| "B": { | ||
| "evm": { | ||
| "bytecode": { | ||
| "object": "<BYTECODE REMOVED>" | ||
| } | ||
| }, | ||
| "transientStorageLayout": { | ||
| "storage": [], | ||
| "types": null | ||
| } | ||
| } | ||
| }, | ||
| "*": { | ||
| "A": { | ||
| "evm": { | ||
| "bytecode": { | ||
| "linkReferences": {}, | ||
| "object": "<BYTECODE REMOVED>" | ||
| } | ||
| } | ||
| }, | ||
| "B": { | ||
| "evm": { | ||
| "bytecode": { | ||
| "object": "<BYTECODE REMOVED>" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "C": { | ||
| "A": { | ||
| "devdoc": { | ||
| "kind": "dev", | ||
| "methods": {}, | ||
| "version": 1 | ||
| }, | ||
| "evm": { | ||
| "bytecode": { | ||
| "linkReferences": {}, | ||
| "object": "<BYTECODE REMOVED>" | ||
| } | ||
| }, | ||
| "storageLayout": { | ||
| "storage": [], | ||
| "types": null | ||
| } | ||
| }, | ||
| "B": { | ||
| "devdoc": { | ||
| "kind": "dev", | ||
| "methods": {}, | ||
| "version": 1 | ||
| }, | ||
| "evm": { | ||
| "bytecode": { | ||
| "object": "<BYTECODE REMOVED>" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "D": { | ||
| "A": { | ||
| "evm": { | ||
| "bytecode": { | ||
| "linkReferences": {}, | ||
| "object": "<BYTECODE REMOVED>" | ||
| } | ||
| } | ||
| }, | ||
| "B": { | ||
| "evm": { | ||
| "bytecode": { | ||
| "object": "<BYTECODE REMOVED>" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "sources": { | ||
| "": { | ||
| "id": 0 | ||
| }, | ||
| "*": { | ||
| "id": 1 | ||
| }, | ||
| "C": { | ||
| "id": 2 | ||
| }, | ||
| "D": { | ||
| "id": 3 | ||
| } | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
...output_selection_multiple_matching_source_and_contract_selectors_full_pipeline/input.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "language": "Solidity", | ||
| "sources": { | ||
| "C": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}, | ||
| "D": {"content": "contract A {}\ncontract B {}\n//SPDX-License-Identifier: GPL-3.0\npragma solidity *;"} | ||
| }, | ||
| "settings": { | ||
| "optimizer": {"enabled": true}, | ||
| "debug": {"debugInfo": []}, | ||
| "outputSelection": { | ||
| // This test uses outputs that require all stages of the pipeline to run, possibly via | ||
| // multiple paths, to make sure the later stages handle more complex output selection correctly. | ||
| // Currently there are only distinct paths (IR, optimized IR and bytecode generation). | ||
| "*": { | ||
| "*": ["evm.bytecode.object"], | ||
| "A": ["irOptimized"] | ||
| }, | ||
| "C": { | ||
| "A": ["ir"] | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
""seems broken. I'm going to report it as an issue. I think we should make it not work as a wildcard. Changing it is technically breaking though. Change the other way is not.