Skip to content

Tests: Fix tests that were using non-existent FileCheck directive CHECK-DAG-LABEL: #60397

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

Merged
merged 4 commits into from
Aug 9, 2022

Conversation

tshortli
Copy link
Contributor

@tshortli tshortli commented Aug 4, 2022

I stumbled across a couple tests that were using CHECK-DAG-LABEL: which isn't currently a real FileCheck directive. As a result, a large number of the assertions in these tests were not actually being checked. I replaced CHECK-DAG-LABEL with CHECK-DAG and then fixed the fallout.

weak_import_native.swift required the most significant updates:

  • There were some out of date checks that needed to be removed or updated.
  • Checks for a few weakly linked symbols were missing.
  • Some optimizer tests that had been added to that file were interfering with the original test once it was fixed. I split the tests about hoisting into their own test case.

… directive) in dynamically_replaceable.sil.
…ck directive) in weak_import_native.swift.

Fix CHECK lines that were out of date and add some missing CHECK lines.
…w test case.

Once the `CHECK-DAG` directives in `weak_import_native` were being recognized correctly, the `CHECK:` lines later in the test were interfering with `CHECK-DAG` matches because some of them straddled the existing `CHECK:` lines.

import weak_import_native_hoist_helper

// We should not hoist the metadata accessor accross the version check.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This test case is purely a copy paste of the original lines from weak_import_native.swift with the mangled names updated.

@tshortli
Copy link
Contributor Author

tshortli commented Aug 5, 2022

@swift-ci please test

@tshortli tshortli merged commit 88304c3 into swiftlang:main Aug 9, 2022
@tshortli tshortli deleted the check-dag-label branch August 9, 2022 05:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant