When run with arguments, prints messages for the given codes. When run with no arguments, prints messages for known valid error codes and some invalid codes.
Not run as part of "make check" since it requires a connection to an xfs server to run, just available for developers to manually run when needed. Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> --- .gitignore | 1 + Makefile.am | 2 +- configure.ac | 1 + test/FSGetErrorText.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++ test/Makefile.am | 30 ++++++++++++++ 5 files changed, 134 insertions(+), 1 deletions(-) create mode 100644 test/FSGetErrorText.c create mode 100644 test/Makefile.am diff --git a/.gitignore b/.gitignore index c6fd754..33330ca 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ core # Edit the following section as needed # For example, !report.pc overrides *.pc. See 'man gitignore' # +test/FSGetErrorText diff --git a/Makefile.am b/Makefile.am index 6d5fc63..9ad8db5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -SUBDIRS = src +SUBDIRS = src test pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libfs.pc diff --git a/configure.ac b/configure.ac index 20f8069..a3f0a04 100644 --- a/configure.ac +++ b/configure.ac @@ -53,5 +53,6 @@ XORG_LINT_LIBRARY([FS]) AC_CONFIG_FILES([Makefile src/Makefile + test/Makefile libfs.pc]) AC_OUTPUT diff --git a/test/FSGetErrorText.c b/test/FSGetErrorText.c new file mode 100644 index 0000000..31523c6 --- /dev/null +++ b/test/FSGetErrorText.c @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +/* + Simple test case for FSGetErrorText. + When run with arguments, prints messages for the given codes. + When run with no arguments, prints messages for known valid error codes + and some invalid codes. +*/ + +#include <stdio.h> +#include <stdlib.h> +#include <errno.h> +#include <X11/fonts/FSlib.h> + +static int +CheckErrorMessage(FSServer *srv, int code, const char *codestr) +{ + char buf[128] = ""; + + if (!FSGetErrorText(srv, code, buf, sizeof(buf))) { + fprintf(stderr, "FSGetErrorText(srv, %s (%d), buf, %d) failed", + codestr, code, sizeof(buf)); + return 0; + } + + printf("FSGetErrorText for code %s (%d) returned:\n|%s|\n\n", + codestr, code, buf); + return 1; +} + +#define CheckNamedErrorMessage(s, e) \ + CheckErrorMessage(s, e, #e) + +int main(int argc, char **argv) +{ + FSServer *srv = FSOpenServer(NULL); + + if (srv == NULL) { + fprintf(stderr, "Failed to open fontserver connection to: %s\n" + "Aborting test. Make sure FONTSERVER is set to a valid xfs server.\n", + FSServerName(NULL)); + exit(1); + } + + if (argc > 1) { + int i; + + for (i = 1; i < argc; i++) { + int c; + errno = 0; + c = strtol(argv[i], NULL, 0); + if (errno != 0) { + perror(argv[i]); + exit(1); + } + CheckErrorMessage (srv, c, ""); + } + exit (0); + } + + /* Default list to check if no arguments specified */ + CheckNamedErrorMessage(srv, FSSuccess); + CheckNamedErrorMessage(srv, FSBadRequest); + CheckNamedErrorMessage(srv, FSBadFormat); + CheckNamedErrorMessage(srv, FSBadFont); + CheckNamedErrorMessage(srv, FSBadRange); + CheckNamedErrorMessage(srv, FSBadEventMask); + CheckNamedErrorMessage(srv, FSBadAccessContext); + CheckNamedErrorMessage(srv, FSBadIDChoice); + CheckNamedErrorMessage(srv, FSBadName); + CheckNamedErrorMessage(srv, FSBadResolution); + CheckNamedErrorMessage(srv, FSBadAlloc); + CheckNamedErrorMessage(srv, FSBadLength); + CheckNamedErrorMessage(srv, FSBadImplementation); + CheckErrorMessage (srv, 12, "<out of range value>"); + CheckErrorMessage (srv, 256, "<out of range value>"); + CheckErrorMessage (srv, 0xffff, "<out of range value>"); + + exit(0); +} diff --git a/test/Makefile.am b/test/Makefile.am new file mode 100644 index 0000000..24c7770 --- /dev/null +++ b/test/Makefile.am @@ -0,0 +1,30 @@ +# +# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +noinst_PROGRAMS = FSGetErrorText + +AM_CFLAGS = $(CWARNFLAGS) $(FS_CFLAGS) +INCLUDES = -I$(top_srcdir)/include + +FSGetErrorText_SOURCES = FSGetErrorText.c +FSGetErrorText_LDADD = ../src/libFS.la -- 1.7.3.2 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel