From 3f97cf3413c46caf2a79f32ac9cda4620972c2d7 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Sun, 16 Mar 2014 16:53:42 -0700
Subject: [PATCH] testsuite: Unify the C and C++ testsuites

These two testsuites differ only in the source file glob and a couple of
additional compiler options; unify the remaining bits.
---
 testsuite/Makefile.am                         |  6 ++--
 testsuite/libffi.call/call.exp                |  3 ++
 .../ffitestcxx.h                              |  0
 .../unwindtest.cc                             |  0
 .../unwindtest_ffi_call.cc                    |  0
 testsuite/libffi.special/special.exp          | 30 -------------------
 6 files changed, 6 insertions(+), 33 deletions(-)
 rename testsuite/{libffi.special => libffi.call}/ffitestcxx.h (100%)
 rename testsuite/{libffi.special => libffi.call}/unwindtest.cc (100%)
 rename testsuite/{libffi.special => libffi.call}/unwindtest_ffi_call.cc (100%)
 delete mode 100644 testsuite/libffi.special/special.exp

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index edc6e61a..44738c9e 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -82,9 +82,9 @@ libffi.call/struct6.c libffi.call/return_ll.c libffi.call/struct9.c	\
 libffi.call/return_sc.c libffi.call/struct7.c				\
 libffi.call/cls_align_uint64.c libffi.call/cls_4byte.c			\
 libffi.call/strlen_win32.c libffi.call/cls_6_1_byte.c			\
-libffi.call/cls_7_1_byte.c libffi.special/unwindtest.cc			\
-libffi.special/special.exp libffi.special/unwindtest_ffi_call.cc	\
-libffi.special/ffitestcxx.h lib/wrapper.exp lib/target-libpath.exp	\
+libffi.call/cls_7_1_byte.c libffi.call/unwindtest.cc			\
+libffi.call/unwindtest_ffi_call.cc	\
+libffi.call/ffitestcxx.h lib/wrapper.exp lib/target-libpath.exp	\
 lib/libffi.exp libffi.call/cls_struct_va1.c				\
 libffi.call/cls_uchar_va.c libffi.call/cls_uint_va.c			\
 libffi.call/cls_ulong_va.c libffi.call/cls_ushort_va.c			\
diff --git a/testsuite/libffi.call/call.exp b/testsuite/libffi.call/call.exp
index c1ad7375..90e400f6 100644
--- a/testsuite/libffi.call/call.exp
+++ b/testsuite/libffi.call/call.exp
@@ -20,6 +20,9 @@ libffi-init
 global srcdir subdir
 
 run-many-tests [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] ""
+if { [string match $using_gcc "yes"] } {
+  run-many-tests [lsort [glob -nocomplain $srcdir/$subdir/*.cc]] "-shared-libgcc -lstdc++"
+}
 
 dg-finish
 
diff --git a/testsuite/libffi.special/ffitestcxx.h b/testsuite/libffi.call/ffitestcxx.h
similarity index 100%
rename from testsuite/libffi.special/ffitestcxx.h
rename to testsuite/libffi.call/ffitestcxx.h
diff --git a/testsuite/libffi.special/unwindtest.cc b/testsuite/libffi.call/unwindtest.cc
similarity index 100%
rename from testsuite/libffi.special/unwindtest.cc
rename to testsuite/libffi.call/unwindtest.cc
diff --git a/testsuite/libffi.special/unwindtest_ffi_call.cc b/testsuite/libffi.call/unwindtest_ffi_call.cc
similarity index 100%
rename from testsuite/libffi.special/unwindtest_ffi_call.cc
rename to testsuite/libffi.call/unwindtest_ffi_call.cc
diff --git a/testsuite/libffi.special/special.exp b/testsuite/libffi.special/special.exp
deleted file mode 100644
index f7155bf4..00000000
--- a/testsuite/libffi.special/special.exp
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2003, 2006, 2009, 2010 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING3.  If not see
-# <http://www.gnu.org/licenses/>.
-
-dg-init
-libffi-init
-
-global srcdir subdir
-
-if { [string match $using_gcc "yes"] } {
-  run-many-tests [lsort [glob -nocomplain $srcdir/$subdir/*.cc]] "-shared-libgcc -lstdc++"
-}
-
-dg-finish
-
-# Local Variables:
-# tcl-indent-level:4
-# End: