Skip to content

[flang][Driver] Fix incorrect condition in test #117391

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 1 commit into from
Nov 25, 2024

Conversation

tarunprabhu
Copy link
Contributor

The conditions in a test did not match the target that was being requested. This resulted in a test failure when building with -DTARGETS_TO_BUILD=X86. This is now fixed.

The conditions in a test did not match the target that was being requested.
This resulted in a test failure when building with -DTARGETS_TO_BUILD=X86. This
is now fixed.
@llvmbot llvmbot added flang:driver flang Flang issues not falling into any other category labels Nov 22, 2024
@llvmbot
Copy link
Member

llvmbot commented Nov 22, 2024

@llvm/pr-subscribers-flang-driver

Author: Tarun Prabhu (tarunprabhu)

Changes

The conditions in a test did not match the target that was being requested. This resulted in a test failure when building with -DTARGETS_TO_BUILD=X86. This is now fixed.


Full diff: https://github.com/llvm/llvm-project/pull/117391.diff

1 Files Affected:

  • (modified) flang/test/Driver/print-supported-cpus.f90 (+2-2)
diff --git a/flang/test/Driver/print-supported-cpus.f90 b/flang/test/Driver/print-supported-cpus.f90
index 13688b193f9b92..60b725d4e1dcfc 100644
--- a/flang/test/Driver/print-supported-cpus.f90
+++ b/flang/test/Driver/print-supported-cpus.f90
@@ -18,11 +18,11 @@
 ! RUN:   %flang --target=aarch64-unknown-linux-gnu --print-supported-cpus 2>&1 \
 ! RUN:     | FileCheck %s --check-prefixes=AARCH64,CHECK \
 ! RUN: %}
-! RUN: %if x86-registered-target %{ \
+! RUN: %if aarch64-registered-target %{ \
 ! RUN:   %flang --target=aarch64-unknown-linux-gnu -mcpu=help 2>&1 \
 ! RUN:     | FileCheck %s --check-prefixes=AARCH64,CHECK \
 ! RUN: %}
-! RUN: %if x86-registered-target %{ \
+! RUN: %if aarch64-registered-target %{ \
 ! RUN:   %flang --target=aarch64-unknown-linux-gnu -mtune=help 2>&1 \
 ! RUN:     | FileCheck %s --check-prefixes=AARCH64,CHECK \
 ! RUN: %}

@tarunprabhu
Copy link
Contributor Author

Apologies for not catching this before merging the original PR.

Copy link
Contributor

@banach-space banach-space left a comment

Choose a reason for hiding this comment

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

Apologies for not catching this before merging the #117199.

You should blame the reviewers :)

LGTM, thanks!

Copy link
Contributor

@tblah tblah left a comment

Choose a reason for hiding this comment

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

Thanks!

@jplehr
Copy link
Contributor

jplehr commented Nov 25, 2024

Is this likely going to fix the errors we are seeing in https://lab.llvm.org/staging/#/builders/105/builds/9796 ?

@tarunprabhu
Copy link
Contributor Author

Is this likely going to fix the errors we are seeing in https://lab.llvm.org/staging/#/builders/105/builds/9796 ?

I haven't looked too closely at the failure, but the error suggests that this might.

@tarunprabhu tarunprabhu merged commit b872c4c into llvm:main Nov 25, 2024
11 checks passed
@jplehr
Copy link
Contributor

jplehr commented Nov 25, 2024

Thank you, it fixes the problem.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
flang:driver flang Flang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants