[flang-commits] [flang] 5c52753 - [Flang] Fix failing plugin tests

[Andrzej Warzynski via flang-commits]

Author: Andrzej Warzynski
Date: 2021-09-29T09:27:11Z
New Revision: 5c52753d9ff27c2d88f001f7fc37a8212f43a926

URL: https://github.com/llvm/llvm-project/commit/5c52753d9ff27c2d88f001f7fc37a8212f43a926
DIFF: https://github.com/llvm/llvm-project/commit/5c52753d9ff27c2d88f001f7fc37a8212f43a926.diff

LOG: [Flang] Fix failing plugin tests

The updated tests were originally added in
https://reviews.llvm.org/D109890 and are currently causing some
buildbots to fail.

This patch:
* adds missing items in the `REQUIRERS` list in tests
* adds `flangOmpReport` (the plugin library added in D109890) as a CMake
  dependency for tests (only when examples are enabled)

Differential Revision: https://reviews.llvm.org/D110682

Added: 
    

Modified: 
    flang/test/CMakeLists.txt
    flang/test/Examples/omp-atomic.f90
    flang/test/Examples/omp-declarative-directive.f90
    flang/test/Examples/omp-device-constructs.f90

Removed: 
    


################################################################################
diff  --git a/flang/test/CMakeLists.txt b/flang/test/CMakeLists.txt
index 1d0bef1cbe66e..5b1f41e8868e9 100644
--- a/flang/test/CMakeLists.txt
+++ b/flang/test/CMakeLists.txt
@@ -58,6 +58,7 @@ endif()
 if (FLANG_BUILD_EXAMPLES)
   list(APPEND FLANG_TEST_DEPENDS
     flangPrintFunctionNames
+    flangOmpReport
     )
 endif ()
 

diff  --git a/flang/test/Examples/omp-atomic.f90 b/flang/test/Examples/omp-atomic.f90
index f30fcb1b64246..7f4927092a32c 100644
--- a/flang/test/Examples/omp-atomic.f90
+++ b/flang/test/Examples/omp-atomic.f90
@@ -1,6 +1,6 @@
 ! Check the flang-omp-report plugin for omp-atomic.f90
 
-! REQUIRES: plugins
+! REQUIRES: plugins, examples, shell
 
 ! RUN: %flang_fc1 -load %llvmshlibdir/flangOmpReport.so -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 3d033542140c1..2606d0ae6f7ae 100644
--- a/flang/test/Examples/omp-declarative-directive.f90
+++ b/flang/test/Examples/omp-declarative-directive.f90
@@ -1,6 +1,6 @@
 ! Check the flang-omp-report plugin for omp-declarative-directive.f90
 
-! REQUIRES: plugins
+! REQUIRES: plugins, examples, shell
 
 ! RUN: %flang_fc1 -load %llvmshlibdir/flangOmpReport.so -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 b286faade6ee9..08ee1acca0d9b 100644
--- a/flang/test/Examples/omp-device-constructs.f90
+++ b/flang/test/Examples/omp-device-constructs.f90
@@ -1,6 +1,6 @@
 ! Check flang-omp-report --femit-yaml for omp-device-constructs.f90
 
-! REQUIRES: plugins
+! REQUIRES: plugins, examples, shell
 
 !RUN: %flang_fc1 -load %llvmshlibdir/flangOmpReport.so -plugin flang-omp-report -fopenmp %s -o - | FileCheck %s