Skip to content

Commit d29c331

Browse files
Googlerluispadron
authored andcommitted
Update order_files_test_setup
Cherry-pick: 908e440
1 parent 0a0b941 commit d29c331

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

test/starlark_tests/rules/order_files_tests_setup.bzl

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,11 @@ def _provider_contents_test_impl(ctx):
2525
target_under_test = analysistest.target_under_test(env)
2626
target_linking_context = target_under_test[CcInfo].linking_context
2727
linker_inputs = target_linking_context.linker_inputs.to_list()
28-
asserts.true(env, linker_inputs[0].additional_inputs[0])
29-
asserts.true(env, linker_inputs[0].user_link_flags[0].startswith("-Wl,-order_file,"))
28+
additional_inputs = [file for linker_input in linker_inputs for file in linker_input.additional_inputs]
29+
user_link_flags = [flag for linker_input in linker_inputs for flag in linker_input.user_link_flags]
30+
31+
asserts.true(env, additional_inputs[0])
32+
asserts.true(env, user_link_flags[0].startswith("-Wl,-order_file,"))
3033

3134
return analysistest.end(env)
3235

@@ -49,7 +52,9 @@ opt_transition = transition(
4952
def _file_contents_test_impl(ctx):
5053
target_under_test = ctx.attr.target_under_test
5154
linker_inputs = target_under_test[CcInfo].linking_context.linker_inputs.to_list()
52-
actual = linker_inputs[0].additional_inputs[0]
55+
additional_inputs = [file for linker_input in linker_inputs for file in linker_input.additional_inputs]
56+
57+
actual = additional_inputs[0]
5358

5459
body = """
5560
echo Testing that {file} matches {expected}

0 commit comments

Comments
 (0)