mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-30 10:45:40 +03:00 
			
		
		
		
	This patch modifies several test cases to use test-skeleton.c. It was generated by a bash script written for this purpose and thus excludes several other tests which I deemed worth a visual inspection before making the change. I intend to follow up with individual patches to the tests skipped by the script. The script itself resides at http://git.io/WODAmg and should reproduce this very patch when run against master. ChangeLog: 2014-10-30 Arjun Shankar <arjun.is@lostca.se> * catgets/test-gencat.c: Use test-skeleton.c. * catgets/tst-catgets.c: Likewise. * csu/tst-empty.c: Likewise. * elf/tst-audit2.c: Likewise. * elf/tst-global1.c: Likewise. * elf/tst-pathopt.c: Likewise. * elf/tst-piemod1.c: Likewise. * elf/tst-tls10.c: Likewise. * elf/tst-tls11.c: Likewise. * elf/tst-tls12.c: Likewise. * gnulib/tst-gcc.c: Likewise. * iconvdata/tst-e2big.c: Likewise. * iconvdata/tst-loading.c: Likewise. * iconv/tst-iconv1.c: Likewise. * iconv/tst-iconv2.c: Likewise. * inet/test-inet6_opt.c: Likewise. * inet/tst-gethnm.c: Likewise. * inet/tst-network.c: Likewise. * inet/tst-ntoa.c: Likewise. * intl/tst-codeset.c: Likewise. * intl/tst-gettext2.c: Likewise. * intl/tst-gettext3.c: Likewise. * intl/tst-ngettext.c: Likewise. * intl/tst-translit.c: Likewise. * io/test-stat.c: Likewise. * libio/test-fmemopen.c: Likewise. * libio/tst-freopen.c: Likewise. * libio/tst-sscanf.c: Likewise. * libio/tst-ungetwc1.c: Likewise. * libio/tst-ungetwc2.c: Likewise. * libio/tst-widetext.c: Likewise. * localedata/tst-ctype.c: Likewise. * localedata/tst-digits.c: Likewise. * localedata/tst-leaks.c: Likewise. * localedata/tst-mbswcs1.c: Likewise. * localedata/tst-mbswcs2.c: Likewise. * localedata/tst-mbswcs3.c: Likewise. * localedata/tst-mbswcs4.c: Likewise. * localedata/tst-mbswcs5.c: Likewise. * localedata/tst-setlocale.c: Likewise. * localedata/tst-trans.c: Likewise. * localedata/tst-wctype.c: Likewise. * localedata/tst-xlocale1.c: Likewise. * login/tst-grantpt.c: Likewise. * malloc/tst-calloc.c: Likewise. * malloc/tst-malloc.c: Likewise. * malloc/tst-mallocstate.c: Likewise. * malloc/tst-mcheck.c: Likewise. * malloc/tst-mtrace.c: Likewise. * malloc/tst-obstack.c: Likewise. * math/atest-exp2.c: Likewise. * math/atest-exp.c: Likewise. * math/atest-sincos.c: Likewise. * math/test-matherr.c: Likewise. * math/test-misc.c: Likewise. * math/test-powl.c: Likewise. * math/tst-definitions.c: Likewise. * misc/tst-dirname.c: Likewise. * misc/tst-efgcvt.c: Likewise. * misc/tst-fdset.c: Likewise. * misc/tst-hsearch.c: Likewise. * misc/tst-mntent2.c: Likewise. * nptl/tst-sem7.c: Likewise. * nptl/tst-sem8.c: Likewise. * nptl/tst-sem9.c: Likewise. * nss/test-netdb.c: Likewise. * posix/tst-fnmatch.c: Likewise. * posix/tst-getlogin.c: Likewise. * posix/tst-gnuglob.c: Likewise. * posix/tst-mmap.c: Likewise. * pwd/tst-getpw.c: Likewise. * resolv/tst-inet_ntop.c: Likewise. * rt/tst-timer.c: Likewise. * stdio-common/test-fseek.c: Likewise. * stdio-common/test-popen.c: Likewise. * stdio-common/test-vfprintf.c: Likewise. * stdio-common/tst-cookie.c: Likewise. * stdio-common/tst-fileno.c: Likewise. * stdio-common/tst-gets.c: Likewise. * stdio-common/tst-obprintf.c: Likewise. * stdio-common/tst-perror.c: Likewise. * stdio-common/tst-sprintf2.c: Likewise. * stdio-common/tst-sprintf3.c: Likewise. * stdio-common/tst-sprintf.c: Likewise. * stdio-common/tst-swprintf.c: Likewise. * stdio-common/tst-tmpnam.c: Likewise. * stdio-common/tst-unbputc.c: Likewise. * stdio-common/tst-wc-printf.c: Likewise. * stdlib/tst-environ.c: Likewise. * stdlib/tst-fmtmsg.c: Likewise. * stdlib/tst-limits.c: Likewise. * stdlib/tst-rand48-2.c: Likewise. * stdlib/tst-rand48.c: Likewise. * stdlib/tst-random2.c: Likewise. * stdlib/tst-random.c: Likewise. * stdlib/tst-strtol.c: Likewise. * stdlib/tst-strtoll.c: Likewise. * stdlib/tst-tls-atexit.c: Likewise. * stdlib/tst-xpg-basename.c: Likewise. * string/test-ffs.c: Likewise. * string/tst-bswap.c: Likewise. * string/tst-inlcall.c: Likewise. * string/tst-strtok.c: Likewise. * string/tst-strxfrm.c: Likewise. * sysdeps/x86_64/tst-audit10.c: Likewise. * sysdeps/x86_64/tst-audit3.c: Likewise. * sysdeps/x86_64/tst-audit4.c: Likewise. * sysdeps/x86_64/tst-audit5.c: Likewise. * time/tst-ftime_l.c: Likewise. * time/tst-getdate.c: Likewise. * time/tst-mktime3.c: Likewise. * time/tst-mktime.c: Likewise. * time/tst-posixtz.c: Likewise. * time/tst-strptime2.c: Likewise. * time/tst-strptime3.c: Likewise. * wcsmbs/tst-btowc.c: Likewise. * wcsmbs/tst-mbrtowc.c: Likewise. * wcsmbs/tst-mbsrtowcs.c: Likewise. * wcsmbs/tst-wchar-h.c: Likewise. * wcsmbs/tst-wcpncpy.c: Likewise. * wcsmbs/tst-wcrtomb.c: Likewise. * wcsmbs/tst-wcsnlen.c: Likewise. * wcsmbs/tst-wcstof.c: Likewise.
		
			
				
	
	
		
			212 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			212 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #include <netinet/in.h>
 | |
| #include <stdio.h>
 | |
| #include <stdlib.h>
 | |
| #include <string.h>
 | |
| #include <stdint.h>
 | |
| 
 | |
| #define OPT_X	42
 | |
| #define OPT_Y	43
 | |
| #define OPT_Z	44
 | |
| 
 | |
| static void *
 | |
| encode_inet6_opt (socklen_t *elp)
 | |
| {
 | |
|   void *eb = NULL;
 | |
|   socklen_t el;
 | |
|   int cl;
 | |
|   void *db;
 | |
|   int offset;
 | |
|   uint8_t val1;
 | |
|   uint16_t val2;
 | |
|   uint32_t val4;
 | |
|   uint64_t val8;
 | |
| 
 | |
|   *elp = 0;
 | |
| #define CHECK() \
 | |
|   if (cl == -1)						\
 | |
|     {							\
 | |
|       printf ("cl == -1 on line %d\n", __LINE__);	\
 | |
|       free (eb);					\
 | |
|       return NULL;					\
 | |
|     }
 | |
| 
 | |
|   /* Estimate the length */
 | |
|   cl = inet6_opt_init (NULL, 0);
 | |
|   CHECK ();
 | |
|   cl = inet6_opt_append (NULL, 0, cl, OPT_X, 12, 8, NULL);
 | |
|   CHECK ();
 | |
|   cl = inet6_opt_append (NULL, 0, cl, OPT_Y, 7, 4, NULL);
 | |
|   CHECK ();
 | |
|   cl = inet6_opt_append (NULL, 0, cl, OPT_Z, 7, 1, NULL);
 | |
|   CHECK ();
 | |
|   cl = inet6_opt_finish (NULL, 0, cl);
 | |
|   CHECK ();
 | |
|   el = cl;
 | |
| 
 | |
|   eb = malloc (el + 8);
 | |
|   if (eb == NULL)
 | |
|     {
 | |
|       puts ("malloc failed");
 | |
|       return NULL;
 | |
|     }
 | |
|   /* Canary.  */
 | |
|   memcpy (eb + el, "deadbeef", 8);
 | |
| 
 | |
|   cl = inet6_opt_init (eb, el);
 | |
|   CHECK ();
 | |
| 
 | |
|   cl = inet6_opt_append (eb, el, cl, OPT_X, 12, 8, &db);
 | |
|   CHECK ();
 | |
|   val4 = 0x12345678;
 | |
|   offset = inet6_opt_set_val (db, 0, &val4, sizeof  (val4));
 | |
|   val8 = 0x0102030405060708LL;
 | |
|   inet6_opt_set_val (db, offset, &val8, sizeof  (val8));
 | |
| 
 | |
|   cl = inet6_opt_append (eb, el, cl, OPT_Y, 7, 4, &db);
 | |
|   CHECK ();
 | |
|   val1 = 0x01;
 | |
|   offset = inet6_opt_set_val (db, 0, &val1, sizeof  (val1));
 | |
|   val2 = 0x1331;
 | |
|   offset = inet6_opt_set_val (db, offset, &val2, sizeof  (val2));
 | |
|   val4 = 0x01020304;
 | |
|   inet6_opt_set_val (db, offset, &val4, sizeof  (val4));
 | |
| 
 | |
|   cl = inet6_opt_append (eb, el, cl, OPT_Z, 7, 1, &db);
 | |
|   CHECK ();
 | |
|   inet6_opt_set_val (db, 0, (void *) "abcdefg", 7);
 | |
| 
 | |
|   cl = inet6_opt_finish (eb, el, cl);
 | |
|   CHECK ();
 | |
| 
 | |
|   if (memcmp (eb + el, "deadbeef", 8) != 0)
 | |
|     {
 | |
|       puts ("Canary corrupted");
 | |
|       free (eb);
 | |
|       return NULL;
 | |
|     }
 | |
|   *elp = el;
 | |
|   return eb;
 | |
| }
 | |
| 
 | |
| int
 | |
| decode_inet6_opt (void *eb, socklen_t el)
 | |
| {
 | |
|   int ret = 0;
 | |
|   int seq = 0;
 | |
|   int cl = 0;
 | |
|   int offset;
 | |
|   uint8_t type;
 | |
|   socklen_t len;
 | |
|   uint8_t val1;
 | |
|   uint16_t val2;
 | |
|   uint32_t val4;
 | |
|   uint64_t val8;
 | |
|   void *db;
 | |
|   char buf[8];
 | |
| 
 | |
|   while ((cl = inet6_opt_next (eb, el, cl, &type, &len, &db)) != -1)
 | |
|     switch (type)
 | |
|       {
 | |
|       case OPT_X:
 | |
| 	if (seq++ != 0)
 | |
| 	  {
 | |
| 	    puts ("OPT_X is not first");
 | |
| 	    ret = 1;
 | |
| 	  }
 | |
| 	if (len != 12)
 | |
| 	  {
 | |
| 	    printf ("OPT_X's length %d != 12\n", len);
 | |
| 	    ret = 1;
 | |
| 	  }
 | |
| 	offset = inet6_opt_get_val (db, 0, &val4, sizeof (val4));
 | |
| 	if (val4 != 0x12345678)
 | |
| 	  {
 | |
| 	    printf ("OPT_X's val4 %x != 0x12345678\n", val4);
 | |
| 	    ret = 1;
 | |
| 	  }
 | |
| 	offset = inet6_opt_get_val (db, offset, &val8, sizeof (val8));
 | |
| 	if (offset != len || val8 != 0x0102030405060708LL)
 | |
| 	  {
 | |
| 	    printf ("OPT_X's val8 %llx != 0x0102030405060708\n",
 | |
| 		    (long long) val8);
 | |
| 	    ret = 1;
 | |
| 	  }
 | |
| 	break;
 | |
|       case OPT_Y:
 | |
| 	if (seq++ != 1)
 | |
| 	  {
 | |
| 	    puts ("OPT_Y is not second");
 | |
| 	    ret = 1;
 | |
| 	  }
 | |
| 	if (len != 7)
 | |
| 	  {
 | |
| 	    printf ("OPT_Y's length %d != 7\n", len);
 | |
| 	    ret = 1;
 | |
| 	  }
 | |
| 	offset = inet6_opt_get_val (db, 0, &val1, sizeof (val1));
 | |
| 	if (val1 != 0x01)
 | |
| 	  {
 | |
| 	    printf ("OPT_Y's val1 %x != 0x01\n", val1);
 | |
| 	    ret = 1;
 | |
| 	  }
 | |
| 	offset = inet6_opt_get_val (db, offset, &val2, sizeof (val2));
 | |
| 	if (val2 != 0x1331)
 | |
| 	  {
 | |
| 	    printf ("OPT_Y's val2 %x != 0x1331\n", val2);
 | |
| 	    ret = 1;
 | |
| 	  }
 | |
| 	offset = inet6_opt_get_val (db, offset, &val4, sizeof (val4));
 | |
| 	if (offset != len || val4 != 0x01020304)
 | |
| 	  {
 | |
| 	    printf ("OPT_Y's val4 %x != 0x01020304\n", val4);
 | |
| 	    ret = 1;
 | |
| 	  }
 | |
| 	break;
 | |
|       case OPT_Z:
 | |
| 	if (seq++ != 2)
 | |
| 	  {
 | |
| 	    puts ("OPT_Z is not third");
 | |
| 	    ret = 1;
 | |
| 	  }
 | |
| 	if (len != 7)
 | |
| 	  {
 | |
| 	    printf ("OPT_Z's length %d != 7\n", len);
 | |
| 	    ret = 1;
 | |
| 	  }
 | |
| 	offset = inet6_opt_get_val (db, 0, buf, 7);
 | |
| 	if (offset != len || memcmp (buf, "abcdefg", 7) != 0)
 | |
| 	  {
 | |
| 	    buf[7] = '\0';
 | |
| 	    printf ("OPT_Z's buf \"%s\" != \"abcdefg\"\n", buf);
 | |
| 	    ret = 1;
 | |
| 	  }
 | |
| 	break;
 | |
|       default:
 | |
| 	printf ("Unknown option %d\n", type);
 | |
| 	ret = 1;
 | |
| 	break;
 | |
|       }
 | |
|   if (seq != 3)
 | |
|     {
 | |
|       puts ("Didn't see all of OPT_X, OPT_Y and OPT_Z");
 | |
|       ret = 1;
 | |
|     }
 | |
|   return ret;
 | |
| }
 | |
| 
 | |
| static int
 | |
| do_test (void)
 | |
| {
 | |
|   void *eb;
 | |
|   socklen_t el;
 | |
|   eb = encode_inet6_opt (&el);
 | |
|   if (eb == NULL)
 | |
|     return 1;
 | |
|   if (decode_inet6_opt (eb, el))
 | |
|     return 1;
 | |
|   return 0;
 | |
| }
 | |
| 
 | |
| #define TEST_FUNCTION do_test ()
 | |
| #include "../test-skeleton.c"
 |