[flang] Remove REQUIRES: shell lines form tests #173339
Open
+15
−15
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The shell feature only implies that we are not running on Windows now that the internal shell feature is available everywhere. Replace it with UNSUPPORTED: system-windows on non-portable tests so we can eventually get rid of the feature.
llvmbot
added
flang:driver
flang
Member
|
@llvm/pr-subscribers-flang-driver Author: Aiden Grossman (boomanaiden154) ChangesThe shell feature only implies that we are not running on Windows now that the internal shell feature is available everywhere. Replace it with UNSUPPORTED: system-windows on non-portable tests so we can eventually get rid of the feature. Full diff: https://github.com/llvm/llvm-project/pull/173339.diff 15 Files Affected:
diff --git a/flang/test/Driver/pass-plugin-not-found.f90 b/flang/test/Driver/pass-plugin-not-found.f90
index fc1e690a0cc72..aa55cdc4b5023 100644
--- a/flang/test/Driver/pass-plugin-not-found.f90
+++ b/flang/test/Driver/pass-plugin-not-found.f90
@@ -1,6 +1,6 @@
! Check the correct error diagnostic is reported when a pass plugin shared object isn't found
-! REQUIRES: plugins, shell
+! REQUIRES: plugins
! RUN: not %flang -fpass-plugin=X.Y %s 2>&1 | FileCheck %s --check-prefix=ERROR
! RUN: not %flang_fc1 -emit-llvm -o /dev/null -fpass-plugin=X.Y %s 2>&1 | FileCheck %s --check-prefix=ERROR
diff --git a/flang/test/Driver/pass-plugin.f90 b/flang/test/Driver/pass-plugin.f90
index 8c8c4c70def86..53c16cacdd247 100644
--- a/flang/test/Driver/pass-plugin.f90
+++ b/flang/test/Driver/pass-plugin.f90
@@ -2,7 +2,7 @@
! UNSUPPORTED: system-windows
-! REQUIRES: plugins, shell, examples
+! REQUIRES: plugins, examples
! RUN: %flang -S %s %loadbye -Xflang -fdebug-pass-manager -o /dev/null \
! RUN: 2>&1 | FileCheck %s
diff --git a/flang/test/Driver/plugin-invalid-name.f90 b/flang/test/Driver/plugin-invalid-name.f90
index 55fc423b5e8f9..c0a652f36ad82 100644
--- a/flang/test/Driver/plugin-invalid-name.f90
+++ b/flang/test/Driver/plugin-invalid-name.f90
@@ -1,6 +1,6 @@
! Check the correct error diagnostic is reported when a plugin name isn't found
-! REQUIRES: plugins, shell
+! REQUIRES: plugins
! RUN: not %flang_fc1 -plugin -wrong-name %s 2>&1 | FileCheck %s --check-prefix=ERROR
diff --git a/flang/test/Examples/feature-list-class.f90 b/flang/test/Examples/feature-list-class.f90
index 61b18c7fdd974..cf847cb04a2bf 100644
--- a/flang/test/Examples/feature-list-class.f90
+++ b/flang/test/Examples/feature-list-class.f90
@@ -1,5 +1,5 @@
! UNSUPPORTED: system-windows
-! REQUIRES: plugins, shell, examples
+! REQUIRES: plugins, examples
! RUN: %flang_fc1 -load %llvmshlibdir/flangFeatureList%pluginext \
! RUN: -plugin feature-list %s 2>&1 | FileCheck %s
diff --git a/flang/test/Examples/feature-list-functions.f90 b/flang/test/Examples/feature-list-functions.f90
index 386e30d5d18ad..df18aa4e9b5fa 100644
--- a/flang/test/Examples/feature-list-functions.f90
+++ b/flang/test/Examples/feature-list-functions.f90
@@ -1,5 +1,5 @@
! UNSUPPORTED: system-windows
-! REQUIRES: plugins, shell, examples
+! REQUIRES: plugins, examples
! RUN: %flang_fc1 -load %llvmshlibdir/flangFeatureList%pluginext \
! RUN: -plugin feature-list %s 2>&1 | FileCheck %s
diff --git a/flang/test/Examples/omp-atomic.f90 b/flang/test/Examples/omp-atomic.f90
index d7e0a1c7e2045..084cf6c509fe6 100644
--- a/flang/test/Examples/omp-atomic.f90
+++ b/flang/test/Examples/omp-atomic.f90
@@ -1,4 +1,4 @@
-! REQUIRES: plugins, examples, shell
+! REQUIRES: plugins, examples
! RUN: %flang_fc1 -load %llvmshlibdir/flangOmpReport%pluginext -plugin flang-omp-report -fopenmp %s -o - | FileCheck %s
diff --git a/flang/test/Examples/omp-declarative-directive.f90 b/flang/test/Examples/omp-declarative-directive.f90
index 6e1b0be733663..6490976198cc3 100644
--- a/flang/test/Examples/omp-declarative-directive.f90
+++ b/flang/test/Examples/omp-declarative-directive.f90
@@ -1,4 +1,4 @@
-! REQUIRES: plugins, examples, shell
+! REQUIRES: plugins, examples
! RUN: %flang_fc1 -load %llvmshlibdir/flangOmpReport%pluginext -plugin flang-omp-report -fopenmp %s -o - | FileCheck %s
diff --git a/flang/test/Examples/omp-device-constructs.f90 b/flang/test/Examples/omp-device-constructs.f90
index ae52f7336970b..70d64077005a7 100644
--- a/flang/test/Examples/omp-device-constructs.f90
+++ b/flang/test/Examples/omp-device-constructs.f90
@@ -1,4 +1,4 @@
-! REQUIRES: plugins, examples, shell
+! REQUIRES: plugins, examples
!RUN: %flang_fc1 -load %llvmshlibdir/flangOmpReport%pluginext -plugin flang-omp-report -fopenmp %s -o - | FileCheck %s
diff --git a/flang/test/Examples/omp-in-reduction-clause.f90 b/flang/test/Examples/omp-in-reduction-clause.f90
index 73ba197d5605a..6634d52e40f59 100644
--- a/flang/test/Examples/omp-in-reduction-clause.f90
+++ b/flang/test/Examples/omp-in-reduction-clause.f90
@@ -1,4 +1,4 @@
-! REQUIRES: plugins, examples, shell
+! REQUIRES: plugins, examples
! RUN: %flang_fc1 -load %llvmshlibdir/flangOmpReport%pluginext -plugin flang-omp-report -fopenmp -fopenmp-version=50 %s -o - | FileCheck %s
diff --git a/flang/test/Examples/omp-nowait.f90 b/flang/test/Examples/omp-nowait.f90
index 1d8f9e0b3f815..7ef8061845da9 100644
--- a/flang/test/Examples/omp-nowait.f90
+++ b/flang/test/Examples/omp-nowait.f90
@@ -1,4 +1,4 @@
-! REQUIRES: plugins, examples, shell
+! REQUIRES: plugins, examples
! RUN: %flang_fc1 -load %llvmshlibdir/flangOmpReport%pluginext -plugin flang-omp-report -fopenmp %s -o - | FileCheck %s
diff --git a/flang/test/Examples/omp-order-clause.f90 b/flang/test/Examples/omp-order-clause.f90
index 976c750e69690..a0872302b14c8 100644
--- a/flang/test/Examples/omp-order-clause.f90
+++ b/flang/test/Examples/omp-order-clause.f90
@@ -1,4 +1,4 @@
-! REQUIRES: plugins, examples, shell
+! REQUIRES: plugins, examples
! RUN: %flang_fc1 -load %llvmshlibdir/flangOmpReport%pluginext -plugin flang-omp-report -fopenmp -fopenmp-version=50 %s -o - | FileCheck %s
diff --git a/flang/test/Examples/omp-sections.f90 b/flang/test/Examples/omp-sections.f90
index 96de363558c7c..3e18d0cd7261a 100644
--- a/flang/test/Examples/omp-sections.f90
+++ b/flang/test/Examples/omp-sections.f90
@@ -1,4 +1,4 @@
-! REQUIRES: plugins, examples, shell
+! REQUIRES: plugins, examples
! RUN: %flang_fc1 -load %llvmshlibdir/flangOmpReport%pluginext -plugin flang-omp-report -fopenmp %s -o - | FileCheck %s
diff --git a/flang/test/Examples/print-fns-calls.f90 b/flang/test/Examples/print-fns-calls.f90
index f45a0932ee215..3ec05fb94fb29 100644
--- a/flang/test/Examples/print-fns-calls.f90
+++ b/flang/test/Examples/print-fns-calls.f90
@@ -1,7 +1,7 @@
! Check the Flang Print Function Names example plugin doesn't count/print function/subroutine calls (should only count definitions)
! This requires that the examples are built (LLVM_BUILD_EXAMPLES=ON) to access flangPrintFunctionNames.so
-! REQUIRES: plugins, examples, shell
+! REQUIRES: plugins, examples
! RUN: %flang_fc1 -load %llvmshlibdir/flangPrintFunctionNames%pluginext -plugin print-fns %s 2>&1 | FileCheck %s
diff --git a/flang/test/Examples/print-fns-definitions.f90 b/flang/test/Examples/print-fns-definitions.f90
index a1f342a246248..a2bea4094fbca 100644
--- a/flang/test/Examples/print-fns-definitions.f90
+++ b/flang/test/Examples/print-fns-definitions.f90
@@ -2,7 +2,7 @@
! This includes internal and external Function/Subroutines, but not Statement Functions
! This requires that the examples are built (LLVM_BUILD_EXAMPLES=ON) to access flangPrintFunctionNames.so
-! REQUIRES: plugins, examples, shell
+! REQUIRES: plugins, examples
! RUN: %flang_fc1 -load %llvmshlibdir/flangPrintFunctionNames%pluginext -plugin print-fns %s 2>&1 | FileCheck %s
diff --git a/flang/test/Examples/print-fns-interfaces.f90 b/flang/test/Examples/print-fns-interfaces.f90
index c1e2f3488e232..5411f3dc5afe2 100644
--- a/flang/test/Examples/print-fns-interfaces.f90
+++ b/flang/test/Examples/print-fns-interfaces.f90
@@ -2,7 +2,7 @@
! (It should only count definitions, which will appear elsewhere for interfaced functions/subroutines)
! This requires that the examples are built (LLVM_BUILD_EXAMPLES=ON) to access flangPrintFunctionNames.so
-! REQUIRES: plugins, examples, shell
+! REQUIRES: plugins, examples
! RUN: %flang_fc1 -load %llvmshlibdir/flangPrintFunctionNames%pluginext -plugin print-fns %s 2>&1 | FileCheck %s
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The shell feature only implies that we are not running on Windows now that the internal shell feature is available everywhere. Replace it with UNSUPPORTED: system-windows on non-portable tests so we can eventually get rid of the feature.