From 7aa14ddbd7eb90ff4cff00baba826ebf82f328b4 Mon Sep 17 00:00:00 2001
From: Mike Stump <mikestump@comcast.net>
Date: Sat, 19 Oct 2013 19:13:15 +0000
Subject: [PATCH] lto.exp: Add support for C/C++ mix language testing.

	* g++.dg/lto/lto.exp: Add support for C/C++ mix language testing.

	* gcc.dg/lto/pr54625-1_0.c: Move from here...
	* g++.dg/lto/pr54625-1_0.c: ... to here.
	* gcc.dg/lto/pr54625-1_1.C: Likewise.
	* g++.dg/lto/pr54625-1_1.C: Likewise.
	* gcc.dg/lto/pr54625-2_0.c: Likewise.
	* g++.dg/lto/pr54625-2_0.c: Likewise.
	* gcc.dg/lto/pr54625-2_1.C: Likewise.
	* g++.dg/lto/pr54625-2_1.C: Likewise.

From-SVN: r203862
---
 gcc/testsuite/ChangeLog                            | 13 +++++++++++++
 gcc/testsuite/g++.dg/lto/lto.exp                   |  2 +-
 gcc/testsuite/{gcc.dg => g++.dg}/lto/pr54625-1_0.c |  0
 gcc/testsuite/{gcc.dg => g++.dg}/lto/pr54625-1_1.C |  0
 gcc/testsuite/{gcc.dg => g++.dg}/lto/pr54625-2_0.c |  0
 gcc/testsuite/{gcc.dg => g++.dg}/lto/pr54625-2_1.C |  0
 6 files changed, 14 insertions(+), 1 deletion(-)
 rename gcc/testsuite/{gcc.dg => g++.dg}/lto/pr54625-1_0.c (100%)
 rename gcc/testsuite/{gcc.dg => g++.dg}/lto/pr54625-1_1.C (100%)
 rename gcc/testsuite/{gcc.dg => g++.dg}/lto/pr54625-2_0.c (100%)
 rename gcc/testsuite/{gcc.dg => g++.dg}/lto/pr54625-2_1.C (100%)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0704c8e2fea..4df46ae4a2b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+2013-10-19  Mike Stump  <mikestump@comcast.net>
+
+	* g++.dg/lto/lto.exp: Add support for C/C++ mix language testing.
+
+	* gcc.dg/lto/pr54625-1_0.c: Move from here...
+	* g++.dg/lto/pr54625-1_0.c: ... to here.
+	* gcc.dg/lto/pr54625-1_1.C: Likewise.
+	* g++.dg/lto/pr54625-1_1.C: Likewise.
+	* gcc.dg/lto/pr54625-2_0.c: Likewise.
+	* g++.dg/lto/pr54625-2_0.c: Likewise.
+	* gcc.dg/lto/pr54625-2_1.C: Likewise.
+	* g++.dg/lto/pr54625-2_1.C: Likewise.
+
 2013-10-19  Oleg Endo  <olegendo@gcc.gnu.org>
 
 	* gcc.target/sh/pr54089-3.c: Fix test for load of constant 31.
diff --git a/gcc/testsuite/g++.dg/lto/lto.exp b/gcc/testsuite/g++.dg/lto/lto.exp
index 29cf3be991d..0c6025dd962 100644
--- a/gcc/testsuite/g++.dg/lto/lto.exp
+++ b/gcc/testsuite/g++.dg/lto/lto.exp
@@ -48,7 +48,7 @@ if { ![check_effective_target_lto] } {
 }
 
 # Main loop.
-foreach src [lsort [find $srcdir/$subdir *_0.C]] {
+foreach src [lsort [find $srcdir/$subdir *_0.\[cC\]]] {
     # If we're only testing specific files and this isn't one of them, skip it.
     if ![runtest_file_p $runtests $src] then {
 	continue
diff --git a/gcc/testsuite/gcc.dg/lto/pr54625-1_0.c b/gcc/testsuite/g++.dg/lto/pr54625-1_0.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/lto/pr54625-1_0.c
rename to gcc/testsuite/g++.dg/lto/pr54625-1_0.c
diff --git a/gcc/testsuite/gcc.dg/lto/pr54625-1_1.C b/gcc/testsuite/g++.dg/lto/pr54625-1_1.C
similarity index 100%
rename from gcc/testsuite/gcc.dg/lto/pr54625-1_1.C
rename to gcc/testsuite/g++.dg/lto/pr54625-1_1.C
diff --git a/gcc/testsuite/gcc.dg/lto/pr54625-2_0.c b/gcc/testsuite/g++.dg/lto/pr54625-2_0.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/lto/pr54625-2_0.c
rename to gcc/testsuite/g++.dg/lto/pr54625-2_0.c
diff --git a/gcc/testsuite/gcc.dg/lto/pr54625-2_1.C b/gcc/testsuite/g++.dg/lto/pr54625-2_1.C
similarity index 100%
rename from gcc/testsuite/gcc.dg/lto/pr54625-2_1.C
rename to gcc/testsuite/g++.dg/lto/pr54625-2_1.C
-- 
2.30.2