Skip to content

Conversation

@kiranchandramohan
Copy link
Contributor

Use a module directory in a test that uses another fortran test to avoid race conditions in module creation.

Use a module directory in a test that uses another fortran test
to avoid race conditions in module creation.
@llvmbot llvmbot added flang Flang issues not falling into any other category flang:fir-hlfir labels Jan 16, 2025
@llvmbot
Copy link
Member

llvmbot commented Jan 16, 2025

@llvm/pr-subscribers-flang-fir-hlfir

Author: Kiran Chandramohan (kiranchandramohan)

Changes

Use a module directory in a test that uses another fortran test to avoid race conditions in module creation.


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

1 Files Affected:

  • (modified) flang/test/Lower/module_use.f90 (+3-2)
diff --git a/flang/test/Lower/module_use.f90 b/flang/test/Lower/module_use.f90
index ad43865470b681..c7b29df882fadc 100644
--- a/flang/test/Lower/module_use.f90
+++ b/flang/test/Lower/module_use.f90
@@ -1,5 +1,6 @@
-! RUN: bbc -emit-fir %S/module_definition.f90
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
+! RUN: rm -fr %t && mkdir %t
+! RUN: bbc -emit-fir -module %t %S/module_definition.f90
+! RUN: bbc -emit-fir -J %t %s -o - | FileCheck %s
 
 ! Test use of module data not defined in this file.
 ! The modules are defined in module_definition.f90

Copy link
Contributor

@tarunprabhu tarunprabhu left a comment

Choose a reason for hiding this comment

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

Other than the -p suggestion, this looks ok. Hopefully it fixes the other issue.

@@ -1,5 +1,6 @@
! RUN: bbc -emit-fir %S/module_definition.f90
! RUN: bbc -emit-fir %s -o - | FileCheck %s
! RUN: rm -fr %t && mkdir %t
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe mkdir -p would be safer, just in case there is something that doesn't exist along the way

@@ -1,5 +1,6 @@
! RUN: bbc -emit-fir %S/module_definition.f90
! RUN: bbc -emit-fir %s -o - | FileCheck %s
! RUN: rm -fr %t && mkdir %t
Copy link
Contributor

Choose a reason for hiding this comment

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

Won't this break Windows bots?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor

@luporl luporl Jan 16, 2025

Choose a reason for hiding this comment

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

Hmm, some other tests use rm and mkdir without excluding Windows, so I guess this is fine.
Sorry for the noise.

Copy link
Contributor

@jeanPerier jeanPerier left a comment

Choose a reason for hiding this comment

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

Thanks Kiran!

@kiranchandramohan kiranchandramohan merged commit 437834e into llvm:main Jan 17, 2025
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

flang:fir-hlfir flang Flang issues not falling into any other category

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants