From 83d574bf079bff222763204356d20d86226c8887 Mon Sep 17 00:00:00 2001
From: Tim Keith <tkeith@nvidia.com>
Date: Mon, 23 Dec 2019 10:40:20 -0800
Subject: [PATCH] [flang] Move forall01 to ERROR_TESTS

That seems to be what was intended and it provides for better checking
of errors.

Original-commit: flang-compiler/f18@99376d77a07aa04173bd20dcc45d08b76cae4a73
Reviewed-on: https://github.com/flang-compiler/f18/pull/904
Tree-same-pre-rewrite: false
---
 flang/test/semantics/CMakeLists.txt | 7 ++-----
 flang/test/semantics/forall01.f90   | 8 ++------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/flang/test/semantics/CMakeLists.txt b/flang/test/semantics/CMakeLists.txt
index 220949e..42c7a41 100644
--- a/flang/test/semantics/CMakeLists.txt
+++ b/flang/test/semantics/CMakeLists.txt
@@ -188,6 +188,7 @@ set(ERROR_TESTS
   call12.f90
   call13.f90
   call14.f90
+  forall01.f90
   misc-declarations.f90
   separate-module-procs.f90
   bindings01.f90
@@ -278,10 +279,6 @@ set(CANONDO_TESTS
   canondo*.[Ff]90
 )
 
-set(FORALL_TESTS
-  forall*.[Ff]90
-)
-
 set(GETSYMBOLS_TESTS
   getsymbols01.f90
   getsymbols02-*.f90
@@ -316,7 +313,7 @@ foreach(test ${MODFILE_TESTS})
 endforeach()
 
 foreach(test ${LABEL_TESTS} ${CANONDO_TESTS} ${DOCONCURRENT_TESTS}
-             ${FORALL_TESTS} ${GETSYMBOLS_TESTS} ${GETDEFINITION_TESTS})
+             ${GETSYMBOLS_TESTS} ${GETDEFINITION_TESTS})
   add_test(NAME ${test}
     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/test_any.sh ${test} ${F18})
 endforeach()
diff --git a/flang/test/semantics/forall01.f90 b/flang/test/semantics/forall01.f90
index 3b09aa6..d77ba14 100644
--- a/flang/test/semantics/forall01.f90
+++ b/flang/test/semantics/forall01.f90
@@ -1,13 +1,9 @@
-! RUN: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
-! CHECK: Previous declaration of 'i'
-! CHECK: Previous declaration of 'j'
-
 subroutine forall
   real :: a(9)
-! ERROR: 'i' is already declared in this scoping unit
+  !ERROR: 'i' is already declared in this scoping unit
   forall (i=1:8, i=1:9)  a(i) = i
   forall (j=1:8)
-! ERROR: 'j' is already declared in this scoping unit
+  !ERROR: 'j' is already declared in this scoping unit
     forall (j=1:9)
     end forall
   end forall
-- 
2.7.4