Skip to content

Commit

Permalink
Merge branch 'mr/pmderodat/valgrind' into 'master'
Browse files Browse the repository at this point in the history 
Update the testsuite after recent memory leak fixes in Prettier-Ada

See merge request eng/libadalang/libadalang!1577
  • Loading branch information
@pmderodat
pmderodat committed Mar 15, 2024
2 parents ae9cef4 + d570974 commit 0cf516e
Show file tree
Hide file tree
Showing 41 changed files with 4,796 additions and 4,804 deletions.
8 changes: 0 additions & 8 deletions testsuite/drivers/unparser_driver.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import os.path

from e3.testsuite.driver.classic import TestSkip

from drivers.base_driver import BaseDriver


Expand All @@ -30,12 +28,6 @@ def unparsing_config_filename(self) -> str:
)

def run(self) -> None:
# TODO (eng/libadalang/prettier-ada#10) Prettier-ada is known to leak
# memory. Until this is fixed, do not bother running related tests in
# Valgrind mode.
if self.env.options.valgrind:
raise TestSkip("Prettier-ada is known to leak memory")

# Run the unparser on "input.ada" for the given grammar rule and
# unparse it with the default unparsing configuration, with a dump of
# the Prettier document.
Expand Down
12 changes: 6 additions & 6 deletions testsuite/tests/unparsing/expr_function/everything_long/doc-baseline.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
"command": "ifBreak",
"ifBreakGroupId": 1,
"breakContents": {
"id": 19,
"id": 16,
"kind": "command",
"command": {
"command": "align",
Expand All @@ -214,13 +214,13 @@
"n": 4
},
"alignContents": {
"id": 18,
"id": 15,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 17,
"id": 14,
"kind": "list",
"list": [
]
Expand All @@ -232,7 +232,7 @@
}
},
"flatContents": {
"id": 16,
"id": 19,
"kind": "command",
"command": {
"command": "align",
Expand All @@ -241,13 +241,13 @@
"n": 2
},
"alignContents": {
"id": 15,
"id": 18,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 14,
"id": 17,
"kind": "list",
"list": [
]
Expand Down
12 changes: 6 additions & 6 deletions testsuite/tests/unparsing/expr_function/long_spec/doc-baseline.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
"command": "ifBreak",
"ifBreakGroupId": 1,
"breakContents": {
"id": 19,
"id": 16,
"kind": "command",
"command": {
"command": "align",
Expand All @@ -214,13 +214,13 @@
"n": 4
},
"alignContents": {
"id": 18,
"id": 15,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 17,
"id": 14,
"kind": "list",
"list": [
]
Expand All @@ -232,7 +232,7 @@
}
},
"flatContents": {
"id": 16,
"id": 19,
"kind": "command",
"command": {
"command": "align",
Expand All @@ -241,13 +241,13 @@
"n": 2
},
"alignContents": {
"id": 15,
"id": 18,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 14,
"id": 17,
"kind": "list",
"list": [
]
Expand Down
12 changes: 6 additions & 6 deletions testsuite/tests/unparsing/expr_function/long_spec_with_aspect/doc-baseline.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
"command": "ifBreak",
"ifBreakGroupId": 1,
"breakContents": {
"id": 19,
"id": 16,
"kind": "command",
"command": {
"command": "align",
Expand All @@ -214,13 +214,13 @@
"n": 4
},
"alignContents": {
"id": 18,
"id": 15,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 17,
"id": 14,
"kind": "list",
"list": [
]
Expand All @@ -232,7 +232,7 @@
}
},
"flatContents": {
"id": 16,
"id": 19,
"kind": "command",
"command": {
"command": "align",
Expand All @@ -241,13 +241,13 @@
"n": 2
},
"alignContents": {
"id": 15,
"id": 18,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 14,
"id": 17,
"kind": "list",
"list": [
]
Expand Down
12 changes: 6 additions & 6 deletions testsuite/tests/unparsing/expr_function/short/doc-baseline.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
"command": "ifBreak",
"ifBreakGroupId": 1,
"breakContents": {
"id": 19,
"id": 16,
"kind": "command",
"command": {
"command": "align",
Expand All @@ -214,13 +214,13 @@
"n": 4
},
"alignContents": {
"id": 18,
"id": 15,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 17,
"id": 14,
"kind": "list",
"list": [
]
Expand All @@ -232,7 +232,7 @@
}
},
"flatContents": {
"id": 16,
"id": 19,
"kind": "command",
"command": {
"command": "align",
Expand All @@ -241,13 +241,13 @@
"n": 2
},
"alignContents": {
"id": 15,
"id": 18,
"kind": "command",
"command": {
"command": "group",
"id": 0,
"groupContents": {
"id": 14,
"id": 17,
"kind": "list",
"list": [
]
Expand Down
Loading

0 comments on commit 0cf516e

Please sign in to comment.