This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[testsuite] C/C++ common tests
- From: Manuel López-Ibáñez <lopezibanez at gmail dot com>
- To: Gcc Patch List <gcc-patches at gcc dot gnu dot org>
- Cc: Janis Johnson <janis187 at us dot ibm dot com>, "Joseph S. Myers" <joseph at codesourcery dot com>, Mark Mitchell <mark at codesourcery dot com>
- Date: Sat, 8 Aug 2009 11:17:26 +0200
- Subject: [testsuite] C/C++ common tests
Tested on x86_64-linux-gnu. I moved this file as an example and to
test the functionality. I am not sure whether we want in general to
move existing duplicated files to c-c++-common but newer files should
go there.
OK for trunk?
2009-08-08 Manuel López-Ibáñez <manu@gcc.gnu.org>
* gcc.dg/dg.exp: Test also c-c++-common dir.
* g++.dg/dg.exp: Likewise.
* g++.dg/warn/Wconversion-real.C: Delete.
* gcc.dg/Wconversion-real.c: Move to ...
* c-c++-common/Wconversion-real.c: ... here.
* lib/target-supports.exp
(check_effective_target_c,check_effective_target_c++): New.
Index: gcc/testsuite/gcc.dg/dg.exp
===================================================================
--- gcc/testsuite/gcc.dg/dg.exp (revision 150491)
+++ gcc/testsuite/gcc.dg/dg.exp (working copy)
@@ -30,7 +30,11 @@ dg-init
# Main loop.
dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cSi\]]] \
"" $DEFAULT_CFLAGS
+# C/C++ common tests.
+dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/*.\[cSi\]]] \
+ " -Wc++-compat " ""
+
# All done.
dg-finish
Index: gcc/testsuite/gcc.dg/Wconversion-real.c
===================================================================
--- gcc/testsuite/gcc.dg/Wconversion-real.c (revision 150491)
+++ gcc/testsuite/gcc.dg/Wconversion-real.c (working copy)
@@ -1,84 +0,0 @@
-/* Test for diagnostics for Wconversion for floating-point. */
-
-/* { dg-do compile } */
-/* { dg-skip-if "doubles are floats" { "avr-*-*" } { "*" } { "" } } */
-/* { dg-options "-std=c99 -Wconversion" } */
-/* { dg-require-effective-target large_double } */
-
-float vfloat;
-double vdouble;
-long double vlongdouble;
-
-void ffloat (float f);
-void fdouble (double d);
-void flongdouble (long double ld);
-
-void h (void)
-{
- float f = 0;
- double d = 0;
- long double ld = 0;
-
- ffloat (3.1); /* { dg-warning "conversion" } */
- vfloat = 3.1; /* { dg-warning "conversion" } */
- ffloat (3.1L); /* { dg-warning "conversion" } */
- vfloat = 3.1L; /* { dg-warning "conversion" } */
- fdouble (3.1L); /* { dg-warning "conversion" "" { target large_long_double } } */
- vdouble = 3.1L; /* { dg-warning "conversion" "" { target large_long_double } } */
- ffloat (vdouble); /* { dg-warning "conversion" } */
- vfloat = vdouble; /* { dg-warning "conversion" } */
- ffloat (vlongdouble); /* { dg-warning "conversion" } */
- vfloat = vlongdouble; /* { dg-warning "conversion" } */
- fdouble (vlongdouble); /* { dg-warning "conversion" "" { target large_long_double } } */
- vdouble = vlongdouble; /* { dg-warning "conversion" "" { target large_long_double } } */
-
-
- ffloat ((float) 3.1);
- vfloat = (float) 3.1;
- ffloat ((float) 3.1L);
- vfloat = (float) 3.1L;
- fdouble ((double) 3.1L);
- vdouble = (double) 3.1L;
- ffloat ((float) vdouble);
- vfloat = (float) vdouble;
- ffloat ((float) vlongdouble);
- vfloat = (float) vlongdouble;
- fdouble ((double) vlongdouble);
- vdouble = (double) vlongdouble;
-
-
- ffloat (3.0);
- vfloat = 3.0;
- ffloat (3.1f);
- vfloat = 3.1f;
- ffloat (0.25L);
- vfloat = 0.25L;
-
-
- fdouble (3.0);
- vdouble = 3.0;
- fdouble (3.1f);
- vdouble = 3.1f;
- fdouble (0.25L);
- vdouble = 0.25L;
-
- flongdouble (3.0);
- vlongdouble = 3.0;
- flongdouble (3.1f);
- vlongdouble = 3.1f;
- flongdouble (0.25L);
- vlongdouble = 0.25L;
-
- ffloat (f);
- vfloat = f;
- fdouble (f);
- vdouble = f;
- fdouble (d);
- vdouble = d;
- flongdouble (f);
- vlongdouble = f;
- flongdouble (d);
- vlongdouble = d;
- flongdouble (ld);
- vlongdouble = ld;
-}
Index: gcc/testsuite/g++.dg/dg.exp
===================================================================
--- gcc/testsuite/g++.dg/dg.exp (revision 150491)
+++ gcc/testsuite/g++.dg/dg.exp (working copy)
@@ -47,7 +47,11 @@ set tests [prune $tests $srcdir/$subdir/
set tests [prune $tests $srcdir/$subdir/graphite/*]
# Main loop.
dg-runtest $tests "" $DEFAULT_CXXFLAGS
+# C/C++ common tests.
+dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/*.\[cSi\]]] \
+ "" ""
+
# All done.
dg-finish
Index: gcc/testsuite/g++.dg/warn/Wconversion-real.C
===================================================================
--- gcc/testsuite/g++.dg/warn/Wconversion-real.C (revision 150491)
+++ gcc/testsuite/g++.dg/warn/Wconversion-real.C (working copy)
@@ -1,85 +0,0 @@
-/* Test for diagnostics for Wconversion for floating-point.
- C++ equivalent of gcc/testsuite/gcc.dg/Wconversion-real.c */
-
-/* { dg-do compile }
-/* { dg-options "-Wconversion" } */
-
-float vfloat;
-double vdouble;
-long double vlongdouble;
-
-void ffloat (float f);
-void fdouble (double d);
-void flongdouble (long double ld);
-
-void h (void)
-{
- float f = 0;
- double d = 0;
- long double ld = 0;
-
- ffloat (3.1); /* { dg-warning "conversion" } */
- vfloat = 3.1; /* { dg-warning "conversion" } */
- ffloat (3.1L); /* { dg-warning "conversion" } */
- vfloat = 3.1L; /* { dg-warning "conversion" } */
- fdouble (3.1L); /* { dg-warning "conversion" "" { target large_long_double } } */
- vdouble = 3.1L; /* { dg-warning "conversion" "" { target large_long_double } } */
- ffloat (vdouble); /* { dg-warning "conversion" } */
- vfloat = vdouble; /* { dg-warning "conversion" } */
- ffloat (vlongdouble); /* { dg-warning "conversion" } */
- vfloat = vlongdouble; /* { dg-warning "conversion" } */
- fdouble (vlongdouble); /* { dg-warning "conversion" "" { target large_long_double } } */
- vdouble = vlongdouble; /* { dg-warning "conversion" "" { target large_long_double } } */
-
-
- ffloat ((float) 3.1);
- vfloat = (float) 3.1;
- ffloat ((float) 3.1L);
- vfloat = (float) 3.1L;
- fdouble ((double) 3.1L);
- vdouble = (double) 3.1L;
- ffloat ((float) vdouble);
- vfloat = (float) vdouble;
- ffloat ((float) vlongdouble);
- vfloat = (float) vlongdouble;
- fdouble ((double) vlongdouble);
- vdouble = (double) vlongdouble;
-
-
- ffloat (3.0);
- vfloat = 3.0;
- ffloat (3.1f);
- vfloat = 3.1f;
- ffloat (0.25L);
- vfloat = 0.25L;
-
-
- fdouble (3.0);
- vdouble = 3.0;
- fdouble (3.1f);
- vdouble = 3.1f;
- fdouble (0.25L);
- vdouble = 0.25L;
-
- flongdouble (3.0);
- vlongdouble = 3.0;
- flongdouble (3.1f);
- vlongdouble = 3.1f;
- flongdouble (0.25L);
- vlongdouble = 0.25L;
-
- ffloat (f);
- vfloat = f;
- fdouble (f);
- vdouble = f;
- fdouble (d);
- vdouble = d;
- flongdouble (f);
- vlongdouble = f;
- flongdouble (d);
- vlongdouble = d;
- flongdouble (ld);
- vlongdouble = ld;
-}
-
-
Index: gcc/testsuite/lib/target-supports.exp
===================================================================
--- gcc/testsuite/lib/target-supports.exp (revision 150491)
+++ gcc/testsuite/lib/target-supports.exp (working copy)
@@ -3073,5 +3073,25 @@ proc check_effective_target_mpc_pow { }
if (__builtin_cpow(1,1) != 1)
link_error();
}
}]
}
+
+# Return 1 if the language for the compiler under test is C.
+
+proc check_effective_target_c { } {
+ global tool
+ if [string match $tool "gcc"] {
+ return 1
+ }
+ return 0
+}
+
+# Return 1 if the language for the compiler under test is C++.
+
+proc check_effective_target_c++ { } {
+ global tool
+ if [string match $tool "g++"] {
+ return 1
+ }
+ return 0
+}
Index: gcc/testsuite/c-c++-common/Wconversion-real.c
===================================================================
--- gcc/testsuite/c-c++-common/Wconversion-real.c (revision 0)
+++ gcc/testsuite/c-c++-common/Wconversion-real.c (working copy)
@@ -1,10 +1,11 @@
/* Test for diagnostics for Wconversion for floating-point. */
/* { dg-do compile } */
/* { dg-skip-if "doubles are floats" { "avr-*-*" } { "*" } { "" } } */
-/* { dg-options "-std=c99 -Wconversion" } */
+/* { dg-options "-std=c99 -Wconversion" { target c } } */
+/* { dg-options "-Wconversion" { target c++ } } */
/* { dg-require-effective-target large_double } */
float vfloat;
double vdouble;
long double vlongdouble;