diff options
author | Simon Josefsson <simon@josefsson.org> | 2009-05-13 18:17:27 +0200 |
---|---|---|
committer | Simon Josefsson <simon@josefsson.org> | 2009-05-13 18:17:27 +0200 |
commit | 691ca320c520d35d5e669a08574f927beb1c4bdf (patch) | |
tree | f7395721a0df954265ef316bc2093eae51ff15a0 /lib/gl | |
parent | a39c5f9fafd4b7bb4396b7a90c2cd66af3fa4290 (diff) | |
download | gnutls-691ca320c520d35d5e669a08574f927beb1c4bdf.tar.gz |
Avoid failing tests.
Diffstat (limited to 'lib/gl')
-rw-r--r-- | lib/gl/Makefile.am | 2 | ||||
-rw-r--r-- | lib/gl/m4/gnulib-cache.m4 | 4 | ||||
-rw-r--r-- | lib/gl/m4/gnulib-comp.m4 | 1 | ||||
-rw-r--r-- | lib/gl/tests/Makefile.am | 9 | ||||
-rw-r--r-- | lib/gl/tests/test-alignof.c | 51 |
5 files changed, 3 insertions, 64 deletions
diff --git a/lib/gl/Makefile.am b/lib/gl/Makefile.am index 4913642cad..821976bbf0 100644 --- a/lib/gl/Makefile.am +++ b/lib/gl/Makefile.am @@ -9,7 +9,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override --lib=liblgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --with-tests --avoid=lseek-tests --lgpl=2 --libtool --macro-prefix=lgl --no-vc-files byteswap c-ctype fseeko func gettext lib-msvc-compat lib-symbol-versions memmem-simple memmove minmax netdb read-file snprintf sockets socklen stdint strcase strverscmp sys_socket sys_stat time_r unistd vasprintf +# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override --lib=liblgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --with-tests --avoid=alignof-tests --avoid=lseek-tests --lgpl=2 --libtool --macro-prefix=lgl --no-vc-files byteswap c-ctype fseeko func gettext lib-msvc-compat lib-symbol-versions memmem-simple memmove minmax netdb read-file snprintf sockets socklen stdint strcase strverscmp sys_socket sys_stat time_r unistd vasprintf AUTOMAKE_OPTIONS = 1.5 gnits diff --git a/lib/gl/m4/gnulib-cache.m4 b/lib/gl/m4/gnulib-cache.m4 index 66d982a6dd..46ea924cf8 100644 --- a/lib/gl/m4/gnulib-cache.m4 +++ b/lib/gl/m4/gnulib-cache.m4 @@ -15,7 +15,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --local-dir=gl/override --lib=liblgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --with-tests --avoid=lseek-tests --lgpl=2 --libtool --macro-prefix=lgl --no-vc-files byteswap c-ctype fseeko func gettext lib-msvc-compat lib-symbol-versions memmem-simple memmove minmax netdb read-file snprintf sockets socklen stdint strcase strverscmp sys_socket sys_stat time_r unistd vasprintf +# gnulib-tool --import --dir=. --local-dir=gl/override --lib=liblgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --with-tests --avoid=alignof-tests --avoid=lseek-tests --lgpl=2 --libtool --macro-prefix=lgl --no-vc-files byteswap c-ctype fseeko func gettext lib-msvc-compat lib-symbol-versions memmem-simple memmove minmax netdb read-file snprintf sockets socklen stdint strcase strverscmp sys_socket sys_stat time_r unistd vasprintf # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([gl/override]) @@ -44,7 +44,7 @@ gl_MODULES([ unistd vasprintf ]) -gl_AVOID([lseek-tests]) +gl_AVOID([alignof-tests lseek-tests]) gl_SOURCE_BASE([gl]) gl_M4_BASE([gl/m4]) gl_PO_BASE([]) diff --git a/lib/gl/m4/gnulib-comp.m4 b/lib/gl/m4/gnulib-comp.m4 index 5679e9d415..9f3f51f6df 100644 --- a/lib/gl/m4/gnulib-comp.m4 +++ b/lib/gl/m4/gnulib-comp.m4 @@ -358,7 +358,6 @@ AC_DEFUN([lgl_FILE_LIST], [ m4/wchar_t.m4 m4/wint_t.m4 m4/xsize.m4 - tests/test-alignof.c tests/test-alloca-opt.c tests/test-byteswap.c tests/test-c-ctype.c diff --git a/lib/gl/tests/Makefile.am b/lib/gl/tests/Makefile.am index ca8f78073e..c6791747fa 100644 --- a/lib/gl/tests/Makefile.am +++ b/lib/gl/tests/Makefile.am @@ -42,15 +42,6 @@ libtests_a_DEPENDENCIES = $(lgltests_LIBOBJS) EXTRA_libtests_a_SOURCES = AM_LIBTOOLFLAGS = --preserve-dup-deps -## begin gnulib module alignof-tests - -TESTS += test-alignof -check_PROGRAMS += test-alignof - -EXTRA_DIST += test-alignof.c - -## end gnulib module alignof-tests - ## begin gnulib module alloca-opt-tests TESTS += test-alloca-opt diff --git a/lib/gl/tests/test-alignof.c b/lib/gl/tests/test-alignof.c deleted file mode 100644 index 851cbf0924..0000000000 --- a/lib/gl/tests/test-alignof.c +++ /dev/null @@ -1,51 +0,0 @@ -/* Test of <alignof.h>. - Copyright (C) 2009 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. If not, see <http://www.gnu.org/licenses/>. */ - -/* Written by Bruno Haible <bruno@clisp.org>, 2009. */ - -#include <config.h> - -#include <alignof.h> - -#include <stddef.h> - -#include "verify.h" - -typedef struct { char a[1]; } struct1; -typedef struct { char a[2]; } struct2; -typedef struct { char a[3]; } struct3; -typedef struct { char a[4]; } struct4; - -#define CHECK(type) \ - typedef struct { char slot1; type slot2; } type##_helper; \ - verify (alignof (type) == offsetof (type##_helper, slot2)); - -CHECK (char) -CHECK (short) -CHECK (int) -CHECK (long) -CHECK (float) -CHECK (double) -CHECK (struct1) -CHECK (struct2) -CHECK (struct3) -CHECK (struct4) - -int -main () -{ - return 0; -} |