diff options
author | Josh Triplett <josh@joshtriplett.org> | 2014-03-16 17:02:05 -0700 |
---|---|---|
committer | Josh Triplett <josh@joshtriplett.org> | 2014-03-16 20:39:06 -0700 |
commit | 4d4d368e5a55d9443c4c53b1b70d58ab6d8c941c (patch) | |
tree | ec5e960ea24442eb64bdf0cb923cdd5d1c650050 /testsuite | |
parent | 3f97cf3413c46caf2a79f32ac9cda4620972c2d7 (diff) | |
download | libffi-4d4d368e5a55d9443c4c53b1b70d58ab6d8c941c.tar.gz |
testsuite: Replace ffitestcxx.h with ffitest.h
ffitest.h contains a superset of the functionality of ffitestcxx.h;
make the C++ tests include ffitest.h instead, and remove ffitestcxx.h.
Diffstat (limited to 'testsuite')
-rw-r--r-- | testsuite/Makefile.am | 2 | ||||
-rw-r--r-- | testsuite/libffi.call/ffitestcxx.h | 55 | ||||
-rw-r--r-- | testsuite/libffi.call/unwindtest.cc | 10 | ||||
-rw-r--r-- | testsuite/libffi.call/unwindtest_ffi_call.cc | 2 |
4 files changed, 3 insertions, 66 deletions
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 44738c9..3cb876b 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -84,7 +84,7 @@ 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.call/unwindtest.cc \ libffi.call/unwindtest_ffi_call.cc \ -libffi.call/ffitestcxx.h lib/wrapper.exp lib/target-libpath.exp \ +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/ffitestcxx.h b/testsuite/libffi.call/ffitestcxx.h deleted file mode 100644 index c6da7ef..0000000 --- a/testsuite/libffi.call/ffitestcxx.h +++ /dev/null @@ -1,55 +0,0 @@ -#include <stdlib.h> -#include <stdio.h> -#include <fcntl.h> -#include <ffi.h> -#include "fficonfig.h" - -#define MAX_ARGS 256 - - -/* Define __UNUSED__ that also other compilers than gcc can run the tests. */ -#undef __UNUSED__ -#if defined(__GNUC__) -#define __UNUSED__ __attribute__((__unused__)) -#else -#define __UNUSED__ -#endif - -#define CHECK(x) (!(x) ? abort() : (void)0) - -/* Prefer MAP_ANON(YMOUS) to /dev/zero, since we don't need to keep a - file open. */ -#ifdef HAVE_MMAP_ANON -# undef HAVE_MMAP_DEV_ZERO - -# include <sys/mman.h> -# ifndef MAP_FAILED -# define MAP_FAILED -1 -# endif -# if !defined (MAP_ANONYMOUS) && defined (MAP_ANON) -# define MAP_ANONYMOUS MAP_ANON -# endif -# define USING_MMAP - -#endif - -#ifdef HAVE_MMAP_DEV_ZERO - -# include <sys/mman.h> -# ifndef MAP_FAILED -# define MAP_FAILED -1 -# endif -# define USING_MMAP - -#endif - - -/* MinGW kludge. */ -#ifdef _WIN64 -#define PRIdLL "I64d" -#define PRIuLL "I64u" -#else -#define PRIdLL "lld" -#define PRIuLL "llu" -#endif - diff --git a/testsuite/libffi.call/unwindtest.cc b/testsuite/libffi.call/unwindtest.cc index a78f4e7..02c34d8 100644 --- a/testsuite/libffi.call/unwindtest.cc +++ b/testsuite/libffi.call/unwindtest.cc @@ -6,15 +6,7 @@ /* { dg-do run } */ -#include "ffitestcxx.h" - -#if defined HAVE_STDINT_H -#include <stdint.h> -#endif - -#if defined HAVE_INTTYPES_H -#include <inttypes.h> -#endif +#include "ffitest.h" void closure_test_fn(ffi_cif* cif __UNUSED__, void* resp __UNUSED__, diff --git a/testsuite/libffi.call/unwindtest_ffi_call.cc b/testsuite/libffi.call/unwindtest_ffi_call.cc index 57191f2..ec61164 100644 --- a/testsuite/libffi.call/unwindtest_ffi_call.cc +++ b/testsuite/libffi.call/unwindtest_ffi_call.cc @@ -6,7 +6,7 @@ /* { dg-do run } */ -#include "ffitestcxx.h" +#include "ffitest.h" static int checking(int a __UNUSED__, short b __UNUSED__, signed char c __UNUSED__) |