Re: [patch] add test for libc/search hsearch implementation.

["J. Johnston" <jjohnstn at redhat dot com>]

cgd@broadcom.com wrote:
> 
> The following patch adds a test for libc/search's hsearch
> implementation.  It's the test used in NetBSD for the hsearch code,
> and i figured, same code (at least, y'all started with the same code),
> should pass the same test.  8-)
> 
> the .exp file was copied verbatim from one of the other newlib tests,
> which is why it has the RH notice.
> 
> verified that this new test passes for mips-elf, when I run the
> testsuite correctly.  8-)
> 

Thanks Chris.  One problem though.  Your patch has the infamous BSD advertising
clause in it.  This clause was dropped in 1999 and we have since scrubbed it out
of our sources:  see  ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change

As the owner of the code, if you will repost the testcase without that clause, I will 
check it in.

BTW: we have already noticed that clause in some of the new imported search code and it 
will be scrubbed shortly.

Thanks,

-- Jeff J.
  
> chris
> =============================================================================
> 2002-06-28  Chris Demetriou  <cgd@broadcom.com>
> 
>         * testsuite/newlib.search/hsearchtest.c: New file to test
>         newlib/libc/search.
>         * testsuite/newlib.search/hsearchtest.exp: Likewise.
> 
> --- /dev/null   Fri Mar 23 20:37:44 2001
> +++ testsuite/newlib.search/hsearchtest.c       Fri Jun 28 14:40:42 2002
> @@ -0,0 +1,130 @@
> +/*     $NetBSD: hsearchtest.c,v 1.4 2002/02/21 07:38:15 itojun Exp $   */
> +
> +/*
> + * Copyright (c) 2001 Christopher G. Demetriou
> + * All rights reserved.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + * 1. Redistributions of source code must retain the above copyright
> + *    notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + *    notice, this list of conditions and the following disclaimer in the
> + *    documentation and/or other materials provided with the distribution.
> + * 3. All advertising materials mentioning features or use of this software
> + *    must display the following acknowledgement:
> + *          This product includes software developed for the
> + *          NetBSD Project.  See http://www.netbsd.org/ for
> + *          information about NetBSD.
> + * 4. The name of the author may not be used to endorse or promote products
> + *    derived from this software without specific prior written permission.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
> + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
> + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
> + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
> + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
> + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
> + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> + *
> + * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
> + */
> +
> +/*
> + * Test program for hsearch() et al.
> + */
> +
> +#include <sys/cdefs.h>
> +#if 0
> +#if !defined(lint)
> +__RCSID("$NetBSD: hsearchtest.c,v 1.4 2002/02/21 07:38:15 itojun Exp $");
> +__COPYRIGHT(
> +"@(#) Copyright (c) 2001 Christopher G. Demetriou.  All rights reserved.\n");
> +#endif /* not lint */
> +#endif
> +
> +#include <search.h>
> +#include <stdlib.h>
> +#include <stdio.h>
> +#include <string.h>
> +
> +#define        TEST(e) ((e) ? (void)0 : testfail(__FILE__, __LINE__, #e))
> +
> +static void
> +testfail(const char *file, unsigned long line, const char *expression)
> +{
> +
> +       fprintf(stderr, "TEST FAILED: %s: file %s, line %ld\n",
> +           expression, file, line);
> +       exit(1);
> +}
> +
> +int
> +main(int argc, char *argv[])
> +{
> +       ENTRY e, *ep, *ep2;
> +       int created_ok;
> +       char ch[2];
> +       int i;
> +
> +       created_ok = hcreate(16);
> +       TEST(created_ok);
> +
> +       /* ch[1] should be constant from here on down. */
> +       ch[1] = '\0';
> +
> +       /* Basic insertions.  Check enough that there'll be collisions. */
> +       for (i = 0; i < 26; i++) {
> +               ch[0] = 'a' + i;
> +               e.key = strdup(ch);     /* ptr to provided key is kept! */
> +               TEST(e.key != NULL);
> +               e.data = (void *)(long)i;
> +               ep = hsearch(e, ENTER);
> +               TEST(ep != NULL);
> +               TEST(strcmp(ep->key, ch) == 0);
> +               TEST((long)ep->data == i);
> +       }
> +
> +       /* e.key should be constant from here on down. */
> +       e.key = ch;
> +
> +       /* Basic lookups. */
> +       for (i = 0; i < 26; i++) {
> +               ch[0] = 'a' + i;
> +               ep = hsearch(e, FIND);
> +               TEST(ep != NULL);
> +               TEST(strcmp(ep->key, ch) == 0);
> +               TEST((long)ep->data == i);
> +       }
> +
> +       /* Check duplicate entry.  Should _not_ overwrite existing data.  */
> +       ch[0] = 'a';
> +       e.data = (void *)(long)12345;
> +       ep = hsearch(e, FIND);
> +       TEST(ep != NULL);
> +       TEST(strcmp(ep->key, ch) == 0);
> +       TEST((long)ep->data == 0);
> +
> +       /* Check for something that's not there. */
> +       ch[0] = 'A';
> +       ep = hsearch(e, FIND);
> +       TEST(ep == NULL);
> +
> +       /* Check two at once. */
> +       ch[0] = 'a';
> +       ep = hsearch(e, FIND);
> +       ch[0] = 'b';
> +       ep2 = hsearch(e, FIND);
> +       TEST(ep != NULL);
> +       TEST(strcmp(ep->key, "a") == 0 && (long)ep->data == 0);
> +       TEST(ep2 != NULL);
> +       TEST(strcmp(ep2->key, "b") == 0 && (long)ep2->data == 1);
> +
> +       hdestroy();
> +
> +       exit(0);
> +}
> --- /dev/null   Fri Mar 23 20:37:44 2001
> +++ testsuite/newlib.search/hsearchtest.exp     Fri Jun 28 14:41:52 2002
> @@ -0,0 +1,12 @@
> +# Copyright (C) 2002 by Red Hat, Incorporated. All rights reserved.
> +#
> +# Permission to use, copy, modify, and distribute this software
> +# is freely granted, provided that this notice is preserved.
> +#
> +
> +load_lib passfail.exp
> +
> +set exclude_list {
> +}
> +
> +newlib_pass_fail_all -x $exclude_list