commit 7efa0e03828dd13e53f5310fc80471604f298d48
author Richard Trieu <rtrieu@google.com> Thu Jul 28 20:30:10 2011 +0000
committer Richard Trieu <rtrieu@google.com> Thu Jul 28 20:30:10 2011 +0000
tree 12fcadd71d3096da0df94c07cff7d4f6134a59fd
parent db33e14661c7a118a2d9a777ae69c0ecaa036e1e

Fix a test case that was intermittently failing.  The issue was that instantiations are not stored in an order preserving structure, so the print order may be impacted.  Modified test case to do two FileCheck passes to ensure that both instantiations are in the same place.

Test originially commited at r136306 and temporarily silenced at r136348.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136385 91177308-0d34-0410-b5e6-96231b3b80d8

test/Misc/ast-dump-templates.cpp

diff --git a/test/Misc/ast-dump-templates.cpp b/test/Misc/ast-dump-templates.cpp
index ea34556..7d56e7b 100644
--- a/test/Misc/ast-dump-templates.cpp
+++ b/test/Misc/ast-dump-templates.cpp
@@ -1,5 +1,6 @@
-// RxUN: %clang_cc1 -ast-dump %s | FileCheck %s
-// RUN: %clang_cc1 -ast-dump %s > /dev/null
+// RUN: %clang_cc1 -ast-dump %s > %t
+// RUN: FileCheck < %t %s -check-prefix=CHECK1
+// RUN: FileCheck < %t %s -check-prefix=CHECK2
 
 template <int X, typename Y, int Z = 5>
 struct foo {
@@ -20,14 +21,19 @@
 }
 
 // Template instantiation - foo
-// CHECK: template <int X = 5, typename Y = int, int Z = 5> struct foo {
-// CHECK: template <int X = 2, typename Y = double, int Z = 3> struct foo {
+// Since the order of instantiation may vary during runs, run FileCheck twice
+// to make sure each instantiation is in the correct spot.
+// CHECK1: template <int X = 5, typename Y = int, int Z = 5> struct foo {
+// CHECK2: template <int X = 2, typename Y = double, int Z = 3> struct foo {
 
 // Template definition - foo
-// CHECK: template <int X, typename Y, int Z = (IntegerLiteral {{.*}} 'int' 5)
+// CHECK1: template <int X, typename Y, int Z = (IntegerLiteral {{.*}} 'int' 5)
+// CHECK2: template <int X, typename Y, int Z = (IntegerLiteral {{.*}} 'int' 5)
 
 // Template instantiation - bar
-// CHECK: template <int A = 5, typename B = int> int bar()
+// CHECK1: template <int A = 5, typename B = int> int bar()
+// CHECK2: template <int A = 5, typename B = int> int bar()
 
 // Template definition - bar
-// CHECK: template <int A, typename B> B bar()
+// CHECK1: template <int A, typename B> B bar()
+// CHECK2: template <int A, typename B> B bar()