JakeHillion/object-introspection
1
0
Fork 0
mirror of https://github.com/JakeHillion/object-introspection.git synced 2024-09-19 19:19:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

test: add features field to integration tests

Browse Source 
Previously we tested different feature flags by using the `cli_options` field
in the test `.toml`. This works for OID but doesn't work for JIT OIL and won't
work for AoT OIL when those tests get added.

This change adds a new higher level `features` field to the test `.toml` which
adds the features to the config file as a prefix. This works with all methods
of generation.

Change the existing `cli_options` features to `features` except for where
they're testing something specific. Enable tests that were previously disabled
for OIL but only didn't work because of not being able to enable features.
Change pointer tests that are currently broken for OIL from `oil_disable` to
`oil_skip` - they can work, but codegen is broken for them at the minute.

Test plan:
- CI
- `make test` is no worse
This commit is contained in:
Jake Hillion 2024-01-16 11:15:05 +00:00 committed by Jake Hillion
parent 4c047b5f91
commit 4975b6e9fa
16 changed files with 113 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/integration/README.md
View File

@ -201,13 +201,23 @@ definitions = '''
Implies `oil_disable`. Implies `oil_disable`.
- `features`
Append this list of features to the configuration. This works for all types
of test.
Example:
```
features = ["chase-raw-pointers"]
```
- `cli_options` - `cli_options`
Additional command line arguments passed to oid. Additional command line arguments passed to oid.
Example: Example:
``` ```
cli_options = ["-fchase-raw-pointers"] cli_options = ["-Ftype-graph"]
``` ```
- `skip`, `oid_skip`, `oil_skip` - `skip`, `oid_skip`, `oil_skip`

19
test/integration/anonymous.toml
View File

@ -84,7 +84,7 @@ definitions = '''
[cases.regular_struct] [cases.regular_struct]
param_types = ["const Node&"] param_types = ["const Node&"]
setup = "return Node{1, 2, 3};" setup = "return Node{1, 2, 3};"
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
expect_json = '''[{ expect_json = '''[{
"staticSize":12, "staticSize":12,
"dynamicSize":0, "dynamicSize":0,
@ -97,7 +97,7 @@ definitions = '''
]}]''' ]}]'''
[cases.anon_struct] [cases.anon_struct]
oil_disable = "oil can't chase raw pointers safely" oil_skip = "pointers are broken in tbv2" # https://github.com/facebookexperimental/object-introspection/issues/458
param_types = ["const AnonStructContainer&"] param_types = ["const AnonStructContainer&"]
setup = ''' setup = '''
return AnonStructContainer{ return AnonStructContainer{
@ -106,7 +106,7 @@ definitions = '''
} }
}; };
''' '''
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
expect_json = '''[{ expect_json = '''[{
"staticSize": 8, "staticSize": 8,
"dynamicSize": 12, "dynamicSize": 12,
@ -143,10 +143,10 @@ definitions = '''
new Node{1, 2, 3} new Node{1, 2, 3}
} }
};''' };'''
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
[cases.anon_typedef] [cases.anon_typedef]
oil_disable = "oil can't chase raw pointers safely" oil_skip = "pointers are broken in tbv2" # https://github.com/facebookexperimental/object-introspection/issues/458
param_types = ["const AnonTypedefContainer&"] param_types = ["const AnonTypedefContainer&"]
setup = ''' setup = '''
return AnonTypedefContainer{ return AnonTypedefContainer{
@ -154,7 +154,7 @@ definitions = '''
.node = new Node{1, 2, 3} .node = new Node{1, 2, 3}
} }
};''' };'''
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
expect_json = '''[{ expect_json = '''[{
"staticSize": 8, "staticSize": 8,
"dynamicSize": 12, "dynamicSize": 12,
@ -196,7 +196,6 @@ definitions = '''
[cases.anon_union] [cases.anon_union]
param_types = ["const AnonUnionContainer&"] param_types = ["const AnonUnionContainer&"]
setup = 'return AnonUnionContainer{ .a = 3 };' setup = 'return AnonUnionContainer{ .a = 3 };'
cli_options = ["-fchase-raw-pointers"]
expect_json = '''[{ expect_json = '''[{
"staticSize": 24, "staticSize": 24,
"dynamicSize": 0, "dynamicSize": 0,
@ -218,10 +217,10 @@ definitions = '''
}]''' }]'''
[cases.nested_anon_struct] [cases.nested_anon_struct]
oil_disable = "oil can't chase raw pointers safely" oil_skip = "pointers are broken in tbv2" # https://github.com/facebookexperimental/object-introspection/issues/458
param_types = ["const NestedAnonContainer&"] param_types = ["const NestedAnonContainer&"]
features = ["chase-raw-pointers"]
setup = 'return NestedAnonContainer{.m = { .v = {.as = {new Node{1, 2, 3}}}}};' setup = 'return NestedAnonContainer{.m = { .v = {.as = {new Node{1, 2, 3}}}}};'
cli_options = ["-fchase-raw-pointers"]
expect_json = '''[{ expect_json = '''[{
"staticSize": 80, "staticSize": 80,
"dynamicSize": 12, "dynamicSize": 12,
@ -290,7 +289,7 @@ definitions = '''
# result.ns[3].nodes.resize(22); # result.ns[3].nodes.resize(22);
# return result; # return result;
# ''' # '''
# cli_options = ["-fchase-raw-pointers"] # features = ["chase-raw-pointers"]
# expect_json = '''[{ # expect_json = '''[{
# "staticSize": 104, # "staticSize": 104,
# "dynamicSize": 556, # "dynamicSize": 556,

2
test/integration/arrays.toml
View File

@ -76,7 +76,7 @@ definitions = '''
"elementStaticSize":4 "elementStaticSize":4
}]}]''' }]}]'''
[cases.multidim] [cases.multidim]
cli_options = ["-ftype-graph"]
param_types = ["const MultiDim&"] param_types = ["const MultiDim&"]
setup = "return {};" setup = "return {};"
expect_json = '''[ expect_json = '''[

14
test/integration/bitfields.toml
View File

@ -53,7 +53,7 @@ definitions = '''
# if they were regular primitives. # if they were regular primitives.
[cases] [cases]
[cases.single] [cases.single]
cli_options = ["-ftype-graph"]
oil_skip = "not implemented" oil_skip = "not implemented"
param_types = ["Single&"] param_types = ["Single&"]
setup = "return {};" setup = "return {};"
@ -62,7 +62,7 @@ definitions = '''
{"staticSize":4, "dynamicSize":0, "exclusiveSize":4} {"staticSize":4, "dynamicSize":0, "exclusiveSize":4}
]}]''' ]}]'''
[cases.within_bytes] [cases.within_bytes]
cli_options = ["-ftype-graph"]
oil_skip = "not implemented" oil_skip = "not implemented"
param_types = ["WithinBytes&"] param_types = ["WithinBytes&"]
setup = "return {};" setup = "return {};"
@ -73,7 +73,7 @@ definitions = '''
{"staticSize":1, "dynamicSize":0, "exclusiveSize":1} {"staticSize":1, "dynamicSize":0, "exclusiveSize":1}
]}]''' ]}]'''
[cases.straddle_bytes] [cases.straddle_bytes]
cli_options = ["-ftype-graph"]
oil_skip = "not implemented" oil_skip = "not implemented"
param_types = ["StraddleBytes&"] param_types = ["StraddleBytes&"]
setup = "return {};" setup = "return {};"
@ -84,7 +84,7 @@ definitions = '''
{"staticSize":1, "dynamicSize":0, "exclusiveSize":1} {"staticSize":1, "dynamicSize":0, "exclusiveSize":1}
]}]''' ]}]'''
[cases.mixed] [cases.mixed]
cli_options = ["-ftype-graph"]
oil_skip = "not implemented" oil_skip = "not implemented"
param_types = ["Mixed&"] param_types = ["Mixed&"]
setup = "return {};" setup = "return {};"
@ -98,13 +98,13 @@ definitions = '''
]}]''' ]}]'''
[cases.more_bits_than_type] # TODO member sizes are wrong [cases.more_bits_than_type] # TODO member sizes are wrong
skip = "drgn errors out" skip = "drgn errors out"
cli_options = ["-ftype-graph"]
oil_skip = "not implemented" oil_skip = "not implemented"
param_types = ["MoreBitsThanType&"] param_types = ["MoreBitsThanType&"]
setup = "return {};" setup = "return {};"
expect_json = '"TODO"' expect_json = '"TODO"'
[cases.zero_bits] [cases.zero_bits]
cli_options = ["-ftype-graph"]
oil_skip = "not implemented" oil_skip = "not implemented"
param_types = ["ZeroBits&"] param_types = ["ZeroBits&"]
setup = "return {};" setup = "return {};"
@ -114,7 +114,7 @@ definitions = '''
{"staticSize":1, "dynamicSize":0, "exclusiveSize":1} {"staticSize":1, "dynamicSize":0, "exclusiveSize":1}
]}]''' ]}]'''
[cases.enum] [cases.enum]
cli_options = ["-ftype-graph"]
oil_skip = "not implemented" oil_skip = "not implemented"
param_types = ["Enum&"] param_types = ["Enum&"]
setup = "return {};" setup = "return {};"

8
test/integration/cycles.toml
View File

@ -23,7 +23,7 @@ definitions = '''
''' '''
[cases] [cases]
[cases.raw_ptr] [cases.raw_ptr]
oil_disable = "oil can't chase pointers safely" oil_skip = "cycles are broken" # https://github.com/facebookexperimental/object-introspection/issues/293
param_types = ["RawNode*"] param_types = ["RawNode*"]
setup = ''' setup = '''
RawNode *first = new RawNode{1, nullptr}; RawNode *first = new RawNode{1, nullptr};
@ -34,7 +34,7 @@ definitions = '''
third->next = first; third->next = first;
return first; return first;
''' '''
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
expect_json = ''' expect_json = '''
[ [
{ {
@ -96,7 +96,7 @@ definitions = '''
''' '''
[cases.raw_ptr_wrapped] [cases.raw_ptr_wrapped]
oil_disable = "oil can't chase pointers safely" oil_skip = "cycles are broken" # https://github.com/facebookexperimental/object-introspection/issues/293
param_types = ["Wrapper<RawNode*>&"] param_types = ["Wrapper<RawNode*>&"]
setup = ''' setup = '''
RawNode *first = new RawNode{1, nullptr}; RawNode *first = new RawNode{1, nullptr};
@ -107,7 +107,7 @@ definitions = '''
third->next = first; third->next = first;
return Wrapper<RawNode*>(first); return Wrapper<RawNode*>(first);
''' '''
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
expect_json = '''[{ expect_json = '''[{
"staticSize": 8, "staticSize": 8,
"dynamicSize": 48, "dynamicSize": 48,

19
test/integration/gen_tests.py
View File

@ -268,6 +268,19 @@ def add_tests(f, config):
add_oil_integration_test(f, config, case_name, case) add_oil_integration_test(f, config, case_name, case)
def get_config_strings(case):
config_prefix = case.get("config_prefix", "")
if "features" in case:
feature_config = "features = ["
for f in case.get("features", []):
feature_config += '"' + f + '"'
feature_config += "]\n"
config_prefix = feature_config + config_prefix
config_suffix = case.get("config_suffix", "")
return (config_prefix, config_suffix)
def add_oid_integration_test(f, config, case_name, case): def add_oid_integration_test(f, config, case_name, case):
probe_type = case.get("type", "entry") probe_type = case.get("type", "entry")
args = case.get("args", "arg0") args = case.get("args", "arg0")
@ -283,8 +296,7 @@ def add_oid_integration_test(f, config, case_name, case):
"{" + ", ".join(f'"{option}"' for option in case.get("cli_options", ())) + "}" "{" + ", ".join(f'"{option}"' for option in case.get("cli_options", ())) + "}"
) )
config_prefix = case.get("config_prefix", "") config_prefix, config_suffix = get_config_strings(case)
config_suffix = case.get("config_suffix", "")
f.write( f.write(
f"\n" f"\n"
@ -356,8 +368,7 @@ def add_oil_integration_test(f, config, case_name, case):
if "oil_disable" in case or "target_function" in case: if "oil_disable" in case or "target_function" in case:
return return
config_prefix = case.get("config_prefix", "") config_prefix, config_suffix = get_config_strings(case)
config_suffix = case.get("config_suffix", "")
f.write( f.write(
f"\n" f"\n"

12
test/integration/inheritance_polymorphic.toml
View File

@ -24,7 +24,7 @@ definitions = '''
[cases] [cases]
[cases.a_as_a] [cases.a_as_a]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const A&"] param_types = ["const A&"]
arg_types = ["A"] arg_types = ["A"]
setup = "return {};" setup = "return {};"
@ -39,7 +39,7 @@ definitions = '''
[cases.b_as_a] [cases.b_as_a]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const A&"] param_types = ["const A&"]
arg_types = ["B"] arg_types = ["B"]
setup = ''' setup = '''
@ -58,7 +58,7 @@ definitions = '''
]}]''' ]}]'''
[cases.b_as_b] [cases.b_as_b]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const B&"] param_types = ["const B&"]
arg_types = ["B"] arg_types = ["B"]
setup = ''' setup = '''
@ -78,7 +78,7 @@ definitions = '''
[cases.c_as_a] [cases.c_as_a]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const A&"] param_types = ["const A&"]
arg_types = ["C"] arg_types = ["C"]
setup = ''' setup = '''
@ -98,7 +98,7 @@ definitions = '''
]}]''' ]}]'''
[cases.c_as_b] [cases.c_as_b]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const B&"] param_types = ["const B&"]
arg_types = ["C"] arg_types = ["C"]
setup = ''' setup = '''
@ -118,7 +118,7 @@ definitions = '''
]}]''' ]}]'''
[cases.c_as_c] [cases.c_as_c]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const C&"] param_types = ["const C&"]
arg_types = ["C"] arg_types = ["C"]
setup = ''' setup = '''

20
test/integration/inheritance_polymorphic_diamond.toml
View File

@ -31,7 +31,7 @@ definitions = '''
[cases] [cases]
[cases.root_as_root] [cases.root_as_root]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const Root&"] param_types = ["const Root&"]
arg_types = ["Root"] arg_types = ["Root"]
setup = "return {};" setup = "return {};"
@ -46,7 +46,7 @@ definitions = '''
[cases.middle1_as_root] [cases.middle1_as_root]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const Root&"] param_types = ["const Root&"]
arg_types = ["Middle1"] arg_types = ["Middle1"]
setup = ''' setup = '''
@ -65,7 +65,7 @@ definitions = '''
]}]''' ]}]'''
[cases.middle1_as_middle1] [cases.middle1_as_middle1]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const Middle1&"] param_types = ["const Middle1&"]
arg_types = ["ns_inheritance_polymorphic_diamond::Middle1"] arg_types = ["ns_inheritance_polymorphic_diamond::Middle1"]
setup = ''' setup = '''
@ -85,7 +85,7 @@ definitions = '''
[cases.middle2_as_root] [cases.middle2_as_root]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const Root&"] param_types = ["const Root&"]
arg_types = ["Middle2"] arg_types = ["Middle2"]
setup = ''' setup = '''
@ -104,7 +104,7 @@ definitions = '''
]}]''' ]}]'''
[cases.middle2_as_middle2] [cases.middle2_as_middle2]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const Middle2&"] param_types = ["const Middle2&"]
arg_types = ["Middle2"] arg_types = ["Middle2"]
setup = ''' setup = '''
@ -124,7 +124,7 @@ definitions = '''
[cases.child_as_middle1_root] [cases.child_as_middle1_root]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
# We need to explicitly cast from Child to Middle1 before going to root to # We need to explicitly cast from Child to Middle1 before going to root to
# resolve the diamond problem # resolve the diamond problem
param_types = ["const Root&"] param_types = ["const Root&"]
@ -150,7 +150,7 @@ definitions = '''
]}]''' ]}]'''
[cases.child_as_middle2_root] [cases.child_as_middle2_root]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
# We need to explicitly cast from Child to Middle2 before going to root to # We need to explicitly cast from Child to Middle2 before going to root to
# resolve the diamond problem # resolve the diamond problem
param_types = ["const Root&"] param_types = ["const Root&"]
@ -176,7 +176,7 @@ definitions = '''
]}]''' ]}]'''
[cases.child_as_middle1] [cases.child_as_middle1]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const Middle1&"] param_types = ["const Middle1&"]
arg_types = ["Child"] arg_types = ["Child"]
setup = ''' setup = '''
@ -200,7 +200,7 @@ definitions = '''
]}]''' ]}]'''
[cases.child_as_middle2] [cases.child_as_middle2]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const Middle2&"] param_types = ["const Middle2&"]
arg_types = ["Child"] arg_types = ["Child"]
setup = ''' setup = '''
@ -224,7 +224,7 @@ definitions = '''
]}]''' ]}]'''
[cases.child_as_child] [cases.child_as_child]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const Child&"] param_types = ["const Child&"]
arg_types = ["Child"] arg_types = ["Child"]
setup = ''' setup = '''

12
test/integration/inheritance_polymorphic_non_dynamic_base.toml
View File

@ -22,7 +22,7 @@ definitions = '''
[cases] [cases]
[cases.a_as_a] [cases.a_as_a]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const A&"] param_types = ["const A&"]
arg_types = ["A"] arg_types = ["A"]
setup = "return {};" setup = "return {};"
@ -54,7 +54,7 @@ definitions = '''
[cases.b_as_a] [cases.b_as_a]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const A&"] param_types = ["const A&"]
arg_types = ["B"] arg_types = ["B"]
setup = ''' setup = '''
@ -71,7 +71,7 @@ definitions = '''
]}]''' ]}]'''
[cases.b_as_b] [cases.b_as_b]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const B&"] param_types = ["const B&"]
arg_types = ["B"] arg_types = ["B"]
setup = ''' setup = '''
@ -109,7 +109,7 @@ definitions = '''
[cases.c_as_a] [cases.c_as_a]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const A&"] param_types = ["const A&"]
arg_types = ["C"] arg_types = ["C"]
setup = ''' setup = '''
@ -126,7 +126,7 @@ definitions = '''
]}]''' ]}]'''
[cases.c_as_b] [cases.c_as_b]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const B&"] param_types = ["const B&"]
arg_types = ["C"] arg_types = ["C"]
setup = ''' setup = '''
@ -146,7 +146,7 @@ definitions = '''
]}]''' ]}]'''
[cases.c_as_c] [cases.c_as_c]
oil_skip = "Polymorphic inheritance disabled in OIL" oil_skip = "Polymorphic inheritance disabled in OIL"
cli_options = ["-fpolymorphic-inheritance"] features = ["polymorphic-inheritance"]
param_types = ["const C&"] param_types = ["const C&"]
arg_types = ["C"] arg_types = ["C"]
setup = ''' setup = '''

26
test/integration/pointers.toml
View File

@ -17,7 +17,7 @@ definitions = '''
skip = "top-level pointers are skipped over" # https://github.com/facebookexperimental/object-introspection/issues/19 skip = "top-level pointers are skipped over" # https://github.com/facebookexperimental/object-introspection/issues/19
param_types = ["int*"] param_types = ["int*"]
setup = "return new int(1);" setup = "return new int(1);"
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
expect_json = '''[{ expect_json = '''[{
"typeName": "int *", "typeName": "int *",
"staticSize": 8, "staticSize": 8,
@ -59,7 +59,7 @@ definitions = '''
skip = "top-level pointers are skipped over" # https://github.com/facebookexperimental/object-introspection/issues/19 skip = "top-level pointers are skipped over" # https://github.com/facebookexperimental/object-introspection/issues/19
param_types = ["void*"] param_types = ["void*"]
setup = "return new int(1);" setup = "return new int(1);"
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
expect_json = '''[{ expect_json = '''[{
"typeName": "void *", "typeName": "void *",
"staticSize": 8, "staticSize": 8,
@ -95,7 +95,7 @@ definitions = '''
skip = "top-level pointers are skipped over" # https://github.com/facebookexperimental/object-introspection/issues/19 skip = "top-level pointers are skipped over" # https://github.com/facebookexperimental/object-introspection/issues/19
param_types = ["std::vector<int>*"] param_types = ["std::vector<int>*"]
setup = "return new std::vector<int>{1,2,3};" setup = "return new std::vector<int>{1,2,3};"
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
expect_json = '''[{ expect_json = '''[{
"typeName": "std::vector<int> *", "typeName": "std::vector<int> *",
"staticSize": 8, "staticSize": 8,
@ -134,10 +134,10 @@ definitions = '''
[cases.struct_primitive_ptrs] [cases.struct_primitive_ptrs]
oil_disable = "oil can't chase raw pointers safely" oil_skip = "pointers are broken in tbv2" # https://github.com/facebookexperimental/object-introspection/issues/458
param_types = ["const PrimitivePtrs&"] param_types = ["const PrimitivePtrs&"]
setup = "return PrimitivePtrs{0, new int(0), new int(0)};" setup = "return PrimitivePtrs{0, new int(0), new int(0)};"
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
expect_json = '''[{ expect_json = '''[{
"staticSize":24, "staticSize":24,
"dynamicSize":4, "dynamicSize":4,
@ -161,9 +161,10 @@ definitions = '''
{"name":"c", "staticSize":8, "dynamicSize":0, "exclusiveSize":8, "size":8} {"name":"c", "staticSize":8, "dynamicSize":0, "exclusiveSize":8, "size":8}
]}]''' ]}]'''
[cases.struct_primitive_ptrs_null] [cases.struct_primitive_ptrs_null]
oil_skip = "pointers are broken in tbv2" # https://github.com/facebookexperimental/object-introspection/issues/458
param_types = ["const PrimitivePtrs&"] param_types = ["const PrimitivePtrs&"]
setup = "return PrimitivePtrs{0, nullptr, nullptr};" setup = "return PrimitivePtrs{0, nullptr, nullptr};"
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
expect_json = '''[{ expect_json = '''[{
"staticSize":24, "staticSize":24,
"dynamicSize":0, "dynamicSize":0,
@ -177,10 +178,10 @@ definitions = '''
[cases.struct_vector_ptr] [cases.struct_vector_ptr]
oil_disable = "oil can't chase raw pointers safely" oil_skip = "pointers are broken in tbv2" # https://github.com/facebookexperimental/object-introspection/issues/458
param_types = ["const VectorPtr&"] param_types = ["const VectorPtr&"]
setup = "return VectorPtr{new std::vector<int>{1,2,3}};" setup = "return VectorPtr{new std::vector<int>{1,2,3}};"
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
expect_json = '''[{ expect_json = '''[{
"staticSize":8, "staticSize":8,
"dynamicSize":36, "dynamicSize":36,
@ -199,9 +200,10 @@ definitions = '''
{"name":"vec", "staticSize":8, "dynamicSize":0, "exclusiveSize":8, "size":8} {"name":"vec", "staticSize":8, "dynamicSize":0, "exclusiveSize":8, "size":8}
]}]''' ]}]'''
[cases.struct_vector_ptr_null] [cases.struct_vector_ptr_null]
oil_skip = "pointers are broken in tbv2" # https://github.com/facebookexperimental/object-introspection/issues/458
param_types = ["const VectorPtr&"] param_types = ["const VectorPtr&"]
setup = "return VectorPtr{nullptr};" setup = "return VectorPtr{nullptr};"
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
expect_json = '''[{ expect_json = '''[{
"staticSize":8, "staticSize":8,
"dynamicSize":0, "dynamicSize":0,
@ -213,10 +215,10 @@ definitions = '''
[cases.vector_of_pointers] [cases.vector_of_pointers]
oil_disable = "oil can't chase raw pointers safely" oil_skip = "pointers are broken in tbv2" # https://github.com/facebookexperimental/object-introspection/issues/458
param_types = ["const std::vector<int*>&"] param_types = ["const std::vector<int*>&"]
setup = "return {{new int(1), nullptr, new int(3)}};" setup = "return {{new int(1), nullptr, new int(3)}};"
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
expect_json = '''[{ expect_json = '''[{
"staticSize":24, "staticSize":24,
"dynamicSize":32, "dynamicSize":32,
@ -258,7 +260,7 @@ definitions = '''
{"name":"c", "staticSize":8, "dynamicSize":0, "exclusiveSize":8, "size":8} {"name":"c", "staticSize":8, "dynamicSize":0, "exclusiveSize":8, "size":8}
]}]''' ]}]'''
[cases.feature_config] [cases.feature_config]
oil_disable = "oil can't chase raw pointers safely" oil_skip = "pointers are broken in tbv2" # https://github.com/facebookexperimental/object-introspection/issues/458
param_types = ["const std::vector<int*>&"] param_types = ["const std::vector<int*>&"]
setup = "return {{new int(1), nullptr, new int(3)}};" setup = "return {{new int(1), nullptr, new int(3)}};"
config_prefix = 'features = ["chase-raw-pointers"]' config_prefix = 'features = ["chase-raw-pointers"]'

10
test/integration/pointers_function.toml
View File

@ -29,11 +29,10 @@ definitions = '''
}] }]
}]''' }]'''
[cases.raw_chase] # We should never chase function pointers [cases.raw_chase] # We should never chase function pointers
oid_skip = "function pointers are not handled correctly" # https://github.com/facebookexperimental/object-introspection/issues/22 skip = "function pointers are not handled correctly" # https://github.com/facebookexperimental/object-introspection/issues/22
oil_disable = "oil can't chase raw pointers safely"
param_types = ["const FuncPtrStruct&"] param_types = ["const FuncPtrStruct&"]
setup = "return {{myFunction}};" setup = "return {{myFunction}};"
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
expect_json = '''[{ expect_json = '''[{
"staticSize": 8, "staticSize": 8,
"dynamicSize": 0, "dynamicSize": 0,
@ -73,11 +72,10 @@ definitions = '''
"NOT": "members" "NOT": "members"
}]''' }]'''
[cases.std_function_chase] # We should never chase function pointers [cases.std_function_chase] # We should never chase function pointers
oid_skip = "function pointers are not handled correctly" # https://github.com/facebookexperimental/object-introspection/issues/22 skip = "function pointers are not handled correctly" # https://github.com/facebookexperimental/object-introspection/issues/22
oil_disable = "oil can't chase raw pointers safely"
param_types = ["std::function<void(int)> &"] param_types = ["std::function<void(int)> &"]
setup = "return myFunction;" setup = "return myFunction;"
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
expect_json = '''[{ expect_json = '''[{
"typeName": "function<void (int)>", "typeName": "function<void (int)>",
"staticSize": 32, "staticSize": 32,

29
test/integration/pointers_incomplete.toml
View File

@ -19,38 +19,37 @@ definitions = '''
''' '''
[cases] [cases]
[cases.raw] [cases.raw]
oil_disable = "oil can't chase raw pointers safely"
oid_skip = "oid codegen fails on this" # https://github.com/facebookexperimental/object-introspection/issues/17 oid_skip = "oid codegen fails on this" # https://github.com/facebookexperimental/object-introspection/issues/17
oil_skip = "oil codegen fails on top level incomplete objects" # https://github.com/facebookexperimental/object-introspection/issues/459
param_types = ["IncompleteType*"] param_types = ["IncompleteType*"]
setup = "return static_cast<IncompleteType*>(::operator new(5));" setup = "return static_cast<IncompleteType*>(::operator new(5));"
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
expect_json = '''[{ expect_json = '''[{
"typeName": "IncompleteType *", "typeName": "IncompleteType",
"staticSize": 8, "staticSize": 0,
"dynamicSize": 0, "dynamicSize": 0,
"NOT": {"pointer": 0},
"NOT": "members" "NOT": "members"
}]''' }]'''
[cases.raw_no_follow] [cases.raw_no_follow]
skip = "oid codegen fails on this" # https://github.com/facebookexperimental/object-introspection/issues/17 oid_skip = "oid codegen fails on this" # https://github.com/facebookexperimental/object-introspection/issues/17
oil_skip = "oil codegen fails on top level incomplete objects" # https://github.com/facebookexperimental/object-introspection/issues/459
param_types = ["IncompleteType*"] param_types = ["IncompleteType*"]
setup = "return static_cast<IncompleteType*>(::operator new(5));" setup = "return static_cast<IncompleteType*>(::operator new(5));"
expect_json = '''[{ expect_json = '''[{
"typeName": "IncompleteType *", "typeName": "IncompleteType",
"staticSize": 8, "staticSize": 0,
"dynamicSize": 0, "dynamicSize": 0,
"NOT": {"pointer": 0},
"NOT": "members" "NOT": "members"
}]''' }]'''
[cases.raw_null] [cases.raw_null]
skip = "oid codegen fails on this" # https://github.com/facebookexperimental/object-introspection/issues/17 oid_skip = "oid codegen fails on this" # https://github.com/facebookexperimental/object-introspection/issues/17
oil_skip = "oil codegen fails on top level incomplete objects" # https://github.com/facebookexperimental/object-introspection/issues/459
param_types = ["IncompleteType*"] param_types = ["IncompleteType*"]
setup = "return nullptr;" setup = "return nullptr;"
expect_json = '''[{ expect_json = '''[{
"typeName": "IncompleteType *", "typeName": "IncompleteType",
"staticSize": 8, "staticSize": 0,
"dynamicSize": 0, "dynamicSize": 0,
"pointer": 0,
"NOT": "members" "NOT": "members"
}]''' }]'''
@ -87,10 +86,10 @@ definitions = '''
expect_json_v2 = '[{"staticSize":16, "exclusiveSize":16}]' expect_json_v2 = '[{"staticSize":16, "exclusiveSize":16}]'
[cases.containing_struct] [cases.containing_struct]
oil_disable = "oil can't chase raw pointers safely" oil_skip = "pointers are broken in tbv2" # https://github.com/facebookexperimental/object-introspection/issues/458
param_types = ["const IncompleteTypeContainer&"] param_types = ["const IncompleteTypeContainer&"]
setup = "return IncompleteTypeContainer{};" setup = "return IncompleteTypeContainer{};"
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
expect_json = '''[{ expect_json = '''[{
"staticSize": 88, "staticSize": 88,
"dynamicSize": 0, "dynamicSize": 0,

4
test/integration/std_smart_ptr.toml
View File

@ -373,7 +373,7 @@ definitions = '''
expect_json_v2 = '''[{ "staticSize": 16, "exclusiveSize": 16, "size": 16, "members":[]}]''' expect_json_v2 = '''[{ "staticSize": 16, "exclusiveSize": 16, "size": 16, "members":[]}]'''
[cases.weak_ptr_int64_present_chase] [cases.weak_ptr_int64_present_chase]
param_types = ["std::weak_ptr<std::uint64_t>&"] param_types = ["std::weak_ptr<std::uint64_t>&"]
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
setup = ''' setup = '''
static std::shared_ptr<std::uint64_t> shd = std::make_shared<std::uint64_t>(0xDEADBEEF); static std::shared_ptr<std::uint64_t> shd = std::make_shared<std::uint64_t>(0xDEADBEEF);
std::weak_ptr<std::uint64_t> weak = shd; std::weak_ptr<std::uint64_t> weak = shd;
@ -392,7 +392,7 @@ definitions = '''
expect_json_v2 = '''[{ "staticSize": 16, "exclusiveSize": 16, "size": 16, "members":[]}]''' expect_json_v2 = '''[{ "staticSize": 16, "exclusiveSize": 16, "size": 16, "members":[]}]'''
[cases.weak_ptr_int64_expired_chase] [cases.weak_ptr_int64_expired_chase]
param_types = ["std::weak_ptr<std::uint64_t>&"] param_types = ["std::weak_ptr<std::uint64_t>&"]
cli_options = ["-fchase-raw-pointers"] features = ["chase-raw-pointers"]
setup = ''' setup = '''
return std::make_shared<std::uint64_t>(0xDEADBEEF); return std::make_shared<std::uint64_t>(0xDEADBEEF);
''' '''

12
test/integration/thrift_isset.toml
View File

@ -85,7 +85,7 @@ namespace cpp2 {
ret.c_ref() = 1; ret.c_ref() = 1;
return ret; return ret;
''' '''
cli_options = ["-fcapture-thrift-isset"] features = ["capture-thrift-isset"]
expect_json = '''[{ expect_json = '''[{
"staticSize":16, "staticSize":16,
"dynamicSize":0, "dynamicSize":0,
@ -109,7 +109,7 @@ namespace cpp2 {
ret.j_ref() = 1; ret.j_ref() = 1;
return ret; return ret;
''' '''
cli_options = ["-fcapture-thrift-isset"] features = ["capture-thrift-isset"]
expect_json = '''[{ expect_json = '''[{
"staticSize":44, "staticSize":44,
"dynamicSize":0, "dynamicSize":0,
@ -136,7 +136,7 @@ namespace cpp2 {
ret.c_ref() = 1; ret.c_ref() = 1;
return ret; return ret;
''' '''
cli_options = ["-fcapture-thrift-isset"] features = ["capture-thrift-isset"]
expect_json = '''[{ expect_json = '''[{
"staticSize":20, "staticSize":20,
"dynamicSize":0, "dynamicSize":0,
@ -156,7 +156,7 @@ namespace cpp2 {
ret.b_ref() = 1; ret.b_ref() = 1;
return ret; return ret;
''' '''
cli_options = ["-fcapture-thrift-isset"] features = ["capture-thrift-isset"]
expect_json = '''[{ expect_json = '''[{
"staticSize":16, "staticSize":16,
"dynamicSize":0, "dynamicSize":0,
@ -176,7 +176,7 @@ namespace cpp2 {
ret.f_ref() = 1; ret.f_ref() = 1;
return ret; return ret;
''' '''
cli_options = ["-fcapture-thrift-isset"] features = ["capture-thrift-isset"]
expect_json = '''[{ expect_json = '''[{
"staticSize":28, "staticSize":28,
"dynamicSize":0, "dynamicSize":0,
@ -199,7 +199,7 @@ namespace cpp2 {
ret.e_ref() = 1; ret.e_ref() = 1;
return ret; return ret;
''' '''
cli_options = ["-fcapture-thrift-isset"] features = ["capture-thrift-isset"]
expect_json = '''[{ expect_json = '''[{
"staticSize":32, "staticSize":32,
"dynamicSize":0, "dynamicSize":0,

6
test/integration/thrift_isset_missing.toml
View File

@ -68,7 +68,7 @@ raw_definitions = '''
ret.__isset.at(2) = true; ret.__isset.at(2) = true;
return ret; return ret;
''' '''
cli_options = ["-fcapture-thrift-isset"] features = ["capture-thrift-isset"]
expect_json = '''[{ expect_json = '''[{
"staticSize":16, "staticSize":16,
"dynamicSize":0, "dynamicSize":0,
@ -89,7 +89,7 @@ raw_definitions = '''
ret.__isset.at(2) = true; ret.__isset.at(2) = true;
return ret; return ret;
''' '''
cli_options = ["-fcapture-thrift-isset"] features = ["capture-thrift-isset"]
expect_json = '''[{ expect_json = '''[{
"staticSize":16, "staticSize":16,
"dynamicSize":0, "dynamicSize":0,
@ -117,7 +117,7 @@ raw_definitions = '''
return ret; return ret;
''' '''
cli_options = ["-fcapture-thrift-isset"] features = ["capture-thrift-isset"]
expect_json = '''[{ expect_json = '''[{
"staticSize":32, "staticSize":32,
"dynamicSize":0, "dynamicSize":0,

2
test/integration/thrift_namespaces.toml
View File

@ -16,7 +16,7 @@ thrift_definitions = '''
namespaceA::namespaceB::TTTTT ret; namespaceA::namespaceB::TTTTT ret;
return ret; return ret;
''' '''
cli_options = ["-fcapture-thrift-isset"] features = ["capture-thrift-isset"]
expect_json = '''[{ expect_json = '''[{
"staticSize":16, "staticSize":16,
"dynamicSize":0, "dynamicSize":0,