From c952a92e20aa6013d8202d0b3fa1d87838c83054 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 14 Nov 2014 11:00:14 +0100 Subject: [PATCH] testsuite: Move complex tests to their own subdirectory It seems a bit silly to isolate them by globbing vs "*complex*" when we can just as easily put them in their own subdirectory. --- testsuite/libffi.call/call.exp | 9 ------ .../cls_align_complex.inc | 0 .../cls_align_complex_double.c | 0 .../cls_align_complex_float.c | 0 .../cls_align_complex_longdouble.c | 0 .../cls_complex.inc | 0 .../cls_complex_double.c | 0 .../cls_complex_float.c | 0 .../cls_complex_longdouble.c | 0 .../cls_complex_struct.inc | 0 .../cls_complex_struct_double.c | 0 .../cls_complex_struct_float.c | 0 .../cls_complex_struct_longdouble.c | 0 .../cls_complex_va.inc | 0 .../cls_complex_va_double.c | 0 .../cls_complex_va_float.c | 0 .../cls_complex_va_longdouble.c | 0 testsuite/libffi.complex/complex.exp | 36 ++++++++++++++++++++++ .../{libffi.call => libffi.complex}/complex.inc | 0 .../complex_defs_double.inc | 0 .../complex_defs_float.inc | 0 .../complex_defs_longdouble.inc | 0 .../complex_double.c | 0 .../complex_float.c | 0 .../{libffi.call => libffi.complex}/complex_int.c | 0 .../complex_longdouble.c | 0 testsuite/libffi.complex/ffitest.h | 1 + .../many_complex.inc | 0 .../many_complex_double.c | 0 .../many_complex_float.c | 0 .../many_complex_longdouble.c | 0 .../return_complex.inc | 0 .../return_complex1.inc | 0 .../return_complex1_double.c | 0 .../return_complex1_float.c | 0 .../return_complex1_longdouble.c | 0 .../return_complex2.inc | 0 .../return_complex2_double.c | 0 .../return_complex2_float.c | 0 .../return_complex2_longdouble.c | 0 .../return_complex_double.c | 0 .../return_complex_float.c | 0 .../return_complex_longdouble.c | 0 43 files changed, 37 insertions(+), 9 deletions(-) rename testsuite/{libffi.call => libffi.complex}/cls_align_complex.inc (100%) rename testsuite/{libffi.call => libffi.complex}/cls_align_complex_double.c (100%) rename testsuite/{libffi.call => libffi.complex}/cls_align_complex_float.c (100%) rename testsuite/{libffi.call => libffi.complex}/cls_align_complex_longdouble.c (100%) rename testsuite/{libffi.call => libffi.complex}/cls_complex.inc (100%) rename testsuite/{libffi.call => libffi.complex}/cls_complex_double.c (100%) rename testsuite/{libffi.call => libffi.complex}/cls_complex_float.c (100%) rename testsuite/{libffi.call => libffi.complex}/cls_complex_longdouble.c (100%) rename testsuite/{libffi.call => libffi.complex}/cls_complex_struct.inc (100%) rename testsuite/{libffi.call => libffi.complex}/cls_complex_struct_double.c (100%) rename testsuite/{libffi.call => libffi.complex}/cls_complex_struct_float.c (100%) rename testsuite/{libffi.call => libffi.complex}/cls_complex_struct_longdouble.c (100%) rename testsuite/{libffi.call => libffi.complex}/cls_complex_va.inc (100%) rename testsuite/{libffi.call => libffi.complex}/cls_complex_va_double.c (100%) rename testsuite/{libffi.call => libffi.complex}/cls_complex_va_float.c (100%) rename testsuite/{libffi.call => libffi.complex}/cls_complex_va_longdouble.c (100%) create mode 100644 testsuite/libffi.complex/complex.exp rename testsuite/{libffi.call => libffi.complex}/complex.inc (100%) rename testsuite/{libffi.call => libffi.complex}/complex_defs_double.inc (100%) rename testsuite/{libffi.call => libffi.complex}/complex_defs_float.inc (100%) rename testsuite/{libffi.call => libffi.complex}/complex_defs_longdouble.inc (100%) rename testsuite/{libffi.call => libffi.complex}/complex_double.c (100%) rename testsuite/{libffi.call => libffi.complex}/complex_float.c (100%) rename testsuite/{libffi.call => libffi.complex}/complex_int.c (100%) rename testsuite/{libffi.call => libffi.complex}/complex_longdouble.c (100%) create mode 100644 testsuite/libffi.complex/ffitest.h rename testsuite/{libffi.call => libffi.complex}/many_complex.inc (100%) rename testsuite/{libffi.call => libffi.complex}/many_complex_double.c (100%) rename testsuite/{libffi.call => libffi.complex}/many_complex_float.c (100%) rename testsuite/{libffi.call => libffi.complex}/many_complex_longdouble.c (100%) rename testsuite/{libffi.call => libffi.complex}/return_complex.inc (100%) rename testsuite/{libffi.call => libffi.complex}/return_complex1.inc (100%) rename testsuite/{libffi.call => libffi.complex}/return_complex1_double.c (100%) rename testsuite/{libffi.call => libffi.complex}/return_complex1_float.c (100%) rename testsuite/{libffi.call => libffi.complex}/return_complex1_longdouble.c (100%) rename testsuite/{libffi.call => libffi.complex}/return_complex2.inc (100%) rename testsuite/{libffi.call => libffi.complex}/return_complex2_double.c (100%) rename testsuite/{libffi.call => libffi.complex}/return_complex2_float.c (100%) rename testsuite/{libffi.call => libffi.complex}/return_complex2_longdouble.c (100%) rename testsuite/{libffi.call => libffi.complex}/return_complex_double.c (100%) rename testsuite/{libffi.call => libffi.complex}/return_complex_float.c (100%) rename testsuite/{libffi.call => libffi.complex}/return_complex_longdouble.c (100%) diff --git a/testsuite/libffi.call/call.exp b/testsuite/libffi.call/call.exp index 54f2834..46fb1eb 100644 --- a/testsuite/libffi.call/call.exp +++ b/testsuite/libffi.call/call.exp @@ -20,18 +20,9 @@ libffi-init global srcdir subdir set tlist [lsearch -inline -all -not -glob [lsort [glob -nocomplain -- $srcdir/$subdir/*.{c,cc}]] *complex*] -set ctlist [lsearch -inline -all -glob [lsort [glob -nocomplain -- $srcdir/$subdir/*.{c,cc}]] *complex*] run-many-tests $tlist "" -if { [libffi_feature_test "#ifdef FFI_TARGET_HAS_COMPLEX_TYPE"] } { - run-many-tests $ctlist "" -} else { - foreach test $ctlist { - unsupported "$test" - } -} - dg-finish # Local Variables: diff --git a/testsuite/libffi.call/cls_align_complex.inc b/testsuite/libffi.complex/cls_align_complex.inc similarity index 100% rename from testsuite/libffi.call/cls_align_complex.inc rename to testsuite/libffi.complex/cls_align_complex.inc diff --git a/testsuite/libffi.call/cls_align_complex_double.c b/testsuite/libffi.complex/cls_align_complex_double.c similarity index 100% rename from testsuite/libffi.call/cls_align_complex_double.c rename to testsuite/libffi.complex/cls_align_complex_double.c diff --git a/testsuite/libffi.call/cls_align_complex_float.c b/testsuite/libffi.complex/cls_align_complex_float.c similarity index 100% rename from testsuite/libffi.call/cls_align_complex_float.c rename to testsuite/libffi.complex/cls_align_complex_float.c diff --git a/testsuite/libffi.call/cls_align_complex_longdouble.c b/testsuite/libffi.complex/cls_align_complex_longdouble.c similarity index 100% rename from testsuite/libffi.call/cls_align_complex_longdouble.c rename to testsuite/libffi.complex/cls_align_complex_longdouble.c diff --git a/testsuite/libffi.call/cls_complex.inc b/testsuite/libffi.complex/cls_complex.inc similarity index 100% rename from testsuite/libffi.call/cls_complex.inc rename to testsuite/libffi.complex/cls_complex.inc diff --git a/testsuite/libffi.call/cls_complex_double.c b/testsuite/libffi.complex/cls_complex_double.c similarity index 100% rename from testsuite/libffi.call/cls_complex_double.c rename to testsuite/libffi.complex/cls_complex_double.c diff --git a/testsuite/libffi.call/cls_complex_float.c b/testsuite/libffi.complex/cls_complex_float.c similarity index 100% rename from testsuite/libffi.call/cls_complex_float.c rename to testsuite/libffi.complex/cls_complex_float.c diff --git a/testsuite/libffi.call/cls_complex_longdouble.c b/testsuite/libffi.complex/cls_complex_longdouble.c similarity index 100% rename from testsuite/libffi.call/cls_complex_longdouble.c rename to testsuite/libffi.complex/cls_complex_longdouble.c diff --git a/testsuite/libffi.call/cls_complex_struct.inc b/testsuite/libffi.complex/cls_complex_struct.inc similarity index 100% rename from testsuite/libffi.call/cls_complex_struct.inc rename to testsuite/libffi.complex/cls_complex_struct.inc diff --git a/testsuite/libffi.call/cls_complex_struct_double.c b/testsuite/libffi.complex/cls_complex_struct_double.c similarity index 100% rename from testsuite/libffi.call/cls_complex_struct_double.c rename to testsuite/libffi.complex/cls_complex_struct_double.c diff --git a/testsuite/libffi.call/cls_complex_struct_float.c b/testsuite/libffi.complex/cls_complex_struct_float.c similarity index 100% rename from testsuite/libffi.call/cls_complex_struct_float.c rename to testsuite/libffi.complex/cls_complex_struct_float.c diff --git a/testsuite/libffi.call/cls_complex_struct_longdouble.c b/testsuite/libffi.complex/cls_complex_struct_longdouble.c similarity index 100% rename from testsuite/libffi.call/cls_complex_struct_longdouble.c rename to testsuite/libffi.complex/cls_complex_struct_longdouble.c diff --git a/testsuite/libffi.call/cls_complex_va.inc b/testsuite/libffi.complex/cls_complex_va.inc similarity index 100% rename from testsuite/libffi.call/cls_complex_va.inc rename to testsuite/libffi.complex/cls_complex_va.inc diff --git a/testsuite/libffi.call/cls_complex_va_double.c b/testsuite/libffi.complex/cls_complex_va_double.c similarity index 100% rename from testsuite/libffi.call/cls_complex_va_double.c rename to testsuite/libffi.complex/cls_complex_va_double.c diff --git a/testsuite/libffi.call/cls_complex_va_float.c b/testsuite/libffi.complex/cls_complex_va_float.c similarity index 100% rename from testsuite/libffi.call/cls_complex_va_float.c rename to testsuite/libffi.complex/cls_complex_va_float.c diff --git a/testsuite/libffi.call/cls_complex_va_longdouble.c b/testsuite/libffi.complex/cls_complex_va_longdouble.c similarity index 100% rename from testsuite/libffi.call/cls_complex_va_longdouble.c rename to testsuite/libffi.complex/cls_complex_va_longdouble.c diff --git a/testsuite/libffi.complex/complex.exp b/testsuite/libffi.complex/complex.exp new file mode 100644 index 0000000..4631db2 --- /dev/null +++ b/testsuite/libffi.complex/complex.exp @@ -0,0 +1,36 @@ +# Copyright (C) 2003, 2006, 2009, 2010, 2014 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 +# . + +dg-init +libffi-init + +global srcdir subdir + +set tlist [lsort [glob -nocomplain -- $srcdir/$subdir/*.{c,cc}]] + +if { [libffi_feature_test "#ifdef FFI_TARGET_HAS_COMPLEX_TYPE"] } { + run-many-tests $tlist "" +} else { + foreach test $tlist { + unsupported "$test" + } +} + +dg-finish + +# Local Variables: +# tcl-indent-level:4 +# End: diff --git a/testsuite/libffi.call/complex.inc b/testsuite/libffi.complex/complex.inc similarity index 100% rename from testsuite/libffi.call/complex.inc rename to testsuite/libffi.complex/complex.inc diff --git a/testsuite/libffi.call/complex_defs_double.inc b/testsuite/libffi.complex/complex_defs_double.inc similarity index 100% rename from testsuite/libffi.call/complex_defs_double.inc rename to testsuite/libffi.complex/complex_defs_double.inc diff --git a/testsuite/libffi.call/complex_defs_float.inc b/testsuite/libffi.complex/complex_defs_float.inc similarity index 100% rename from testsuite/libffi.call/complex_defs_float.inc rename to testsuite/libffi.complex/complex_defs_float.inc diff --git a/testsuite/libffi.call/complex_defs_longdouble.inc b/testsuite/libffi.complex/complex_defs_longdouble.inc similarity index 100% rename from testsuite/libffi.call/complex_defs_longdouble.inc rename to testsuite/libffi.complex/complex_defs_longdouble.inc diff --git a/testsuite/libffi.call/complex_double.c b/testsuite/libffi.complex/complex_double.c similarity index 100% rename from testsuite/libffi.call/complex_double.c rename to testsuite/libffi.complex/complex_double.c diff --git a/testsuite/libffi.call/complex_float.c b/testsuite/libffi.complex/complex_float.c similarity index 100% rename from testsuite/libffi.call/complex_float.c rename to testsuite/libffi.complex/complex_float.c diff --git a/testsuite/libffi.call/complex_int.c b/testsuite/libffi.complex/complex_int.c similarity index 100% rename from testsuite/libffi.call/complex_int.c rename to testsuite/libffi.complex/complex_int.c diff --git a/testsuite/libffi.call/complex_longdouble.c b/testsuite/libffi.complex/complex_longdouble.c similarity index 100% rename from testsuite/libffi.call/complex_longdouble.c rename to testsuite/libffi.complex/complex_longdouble.c diff --git a/testsuite/libffi.complex/ffitest.h b/testsuite/libffi.complex/ffitest.h new file mode 100644 index 0000000..d27d362 --- /dev/null +++ b/testsuite/libffi.complex/ffitest.h @@ -0,0 +1 @@ +#include "../libffi.call/ffitest.h" diff --git a/testsuite/libffi.call/many_complex.inc b/testsuite/libffi.complex/many_complex.inc similarity index 100% rename from testsuite/libffi.call/many_complex.inc rename to testsuite/libffi.complex/many_complex.inc diff --git a/testsuite/libffi.call/many_complex_double.c b/testsuite/libffi.complex/many_complex_double.c similarity index 100% rename from testsuite/libffi.call/many_complex_double.c rename to testsuite/libffi.complex/many_complex_double.c diff --git a/testsuite/libffi.call/many_complex_float.c b/testsuite/libffi.complex/many_complex_float.c similarity index 100% rename from testsuite/libffi.call/many_complex_float.c rename to testsuite/libffi.complex/many_complex_float.c diff --git a/testsuite/libffi.call/many_complex_longdouble.c b/testsuite/libffi.complex/many_complex_longdouble.c similarity index 100% rename from testsuite/libffi.call/many_complex_longdouble.c rename to testsuite/libffi.complex/many_complex_longdouble.c diff --git a/testsuite/libffi.call/return_complex.inc b/testsuite/libffi.complex/return_complex.inc similarity index 100% rename from testsuite/libffi.call/return_complex.inc rename to testsuite/libffi.complex/return_complex.inc diff --git a/testsuite/libffi.call/return_complex1.inc b/testsuite/libffi.complex/return_complex1.inc similarity index 100% rename from testsuite/libffi.call/return_complex1.inc rename to testsuite/libffi.complex/return_complex1.inc diff --git a/testsuite/libffi.call/return_complex1_double.c b/testsuite/libffi.complex/return_complex1_double.c similarity index 100% rename from testsuite/libffi.call/return_complex1_double.c rename to testsuite/libffi.complex/return_complex1_double.c diff --git a/testsuite/libffi.call/return_complex1_float.c b/testsuite/libffi.complex/return_complex1_float.c similarity index 100% rename from testsuite/libffi.call/return_complex1_float.c rename to testsuite/libffi.complex/return_complex1_float.c diff --git a/testsuite/libffi.call/return_complex1_longdouble.c b/testsuite/libffi.complex/return_complex1_longdouble.c similarity index 100% rename from testsuite/libffi.call/return_complex1_longdouble.c rename to testsuite/libffi.complex/return_complex1_longdouble.c diff --git a/testsuite/libffi.call/return_complex2.inc b/testsuite/libffi.complex/return_complex2.inc similarity index 100% rename from testsuite/libffi.call/return_complex2.inc rename to testsuite/libffi.complex/return_complex2.inc diff --git a/testsuite/libffi.call/return_complex2_double.c b/testsuite/libffi.complex/return_complex2_double.c similarity index 100% rename from testsuite/libffi.call/return_complex2_double.c rename to testsuite/libffi.complex/return_complex2_double.c diff --git a/testsuite/libffi.call/return_complex2_float.c b/testsuite/libffi.complex/return_complex2_float.c similarity index 100% rename from testsuite/libffi.call/return_complex2_float.c rename to testsuite/libffi.complex/return_complex2_float.c diff --git a/testsuite/libffi.call/return_complex2_longdouble.c b/testsuite/libffi.complex/return_complex2_longdouble.c similarity index 100% rename from testsuite/libffi.call/return_complex2_longdouble.c rename to testsuite/libffi.complex/return_complex2_longdouble.c diff --git a/testsuite/libffi.call/return_complex_double.c b/testsuite/libffi.complex/return_complex_double.c similarity index 100% rename from testsuite/libffi.call/return_complex_double.c rename to testsuite/libffi.complex/return_complex_double.c diff --git a/testsuite/libffi.call/return_complex_float.c b/testsuite/libffi.complex/return_complex_float.c similarity index 100% rename from testsuite/libffi.call/return_complex_float.c rename to testsuite/libffi.complex/return_complex_float.c diff --git a/testsuite/libffi.call/return_complex_longdouble.c b/testsuite/libffi.complex/return_complex_longdouble.c similarity index 100% rename from testsuite/libffi.call/return_complex_longdouble.c rename to testsuite/libffi.complex/return_complex_longdouble.c -- 2.7.4