From 393489b38bb3255af0b3e7b61f44ad1a2a97146b Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 16 Dec 2022 17:39:06 -0700 Subject: [PATCH] Add wcswidth and test --- src/header/wchar/mod.rs | 14 +++++++++++--- tests/Makefile | 1 + tests/expected/bins_dynamic/args.stdout | 1 - tests/expected/bins_dynamic/errno.stderr | 0 tests/expected/bins_dynamic/errno.stdout | 6 ------ tests/expected/{ => bins_static}/alloca.stderr | 0 tests/expected/{ => bins_static}/alloca.stdout | 0 tests/expected/{ => bins_static}/arpainet.stderr | 0 tests/expected/{ => bins_static}/arpainet.stdout | 0 tests/expected/{ => bins_static}/assert.stderr | 0 tests/expected/{ => bins_static}/assert.stdout | 0 .../expected/{ => bins_static}/constructor.stderr | 0 .../expected/{ => bins_static}/constructor.stdout | 0 tests/expected/{ => bins_static}/ctype.stderr | 0 tests/expected/{ => bins_static}/ctype.stdout | 0 tests/expected/{ => bins_static}/destructor.stderr | 0 tests/expected/{ => bins_static}/destructor.stdout | 0 .../{ => bins_static}/dirent/scandir.stderr | 0 .../{ => bins_static}/dirent/scandir.stdout | 0 tests/expected/{ => bins_static}/error.stderr | 0 tests/expected/{ => bins_static}/error.stdout | 0 .../expected/{ => bins_static}/fcntl/create.stderr | 0 .../expected/{ => bins_static}/fcntl/create.stdout | 0 .../expected/{ => bins_static}/fcntl/fcntl.stderr | 0 .../expected/{ => bins_static}/fcntl/fcntl.stdout | 0 tests/expected/{ => bins_static}/fnmatch.stderr | 0 tests/expected/{ => bins_static}/fnmatch.stdout | 0 tests/expected/{ => bins_static}/futimens.stderr | 0 tests/expected/{ => bins_static}/futimens.stdout | 0 tests/expected/{ => bins_static}/libgen.stderr | 0 tests/expected/{ => bins_static}/libgen.stdout | 0 tests/expected/{ => bins_static}/locale.stderr | 0 tests/expected/{ => bins_static}/locale.stdout | 0 tests/expected/{ => bins_static}/math.stderr | 0 tests/expected/{ => bins_static}/math.stdout | 0 .../{ => bins_static}/netdb/getaddrinfo.stderr | 0 .../{ => bins_static}/netdb/getaddrinfo.stdout | 0 tests/expected/{ => bins_static}/ptrace.stderr | 0 tests/expected/{ => bins_static}/ptrace.stdout | 0 tests/expected/{ => bins_static}/regex.stderr | 0 tests/expected/{ => bins_static}/regex.stdout | 0 tests/expected/{ => bins_static}/select.stderr | 0 tests/expected/{ => bins_static}/select.stdout | 0 tests/expected/{ => bins_static}/setjmp.stderr | 0 tests/expected/{ => bins_static}/setjmp.stdout | 0 tests/expected/{ => bins_static}/sigaction.stderr | 0 tests/expected/{ => bins_static}/sigaction.stdout | 0 tests/expected/{ => bins_static}/signal.stderr | 0 tests/expected/{ => bins_static}/signal.stdout | 0 tests/expected/{ => bins_static}/stdio/all.stderr | 0 tests/expected/{ => bins_static}/stdio/all.stdout | 0 .../expected/{ => bins_static}/stdio/buffer.stderr | 0 .../expected/{ => bins_static}/stdio/buffer.stdout | 0 .../expected/{ => bins_static}/stdio/fgets.stderr | 0 .../expected/{ => bins_static}/stdio/fgets.stdout | 0 .../expected/{ => bins_static}/stdio/fputs.stderr | 0 .../expected/{ => bins_static}/stdio/fputs.stdout | 0 .../expected/{ => bins_static}/stdio/fread.stderr | 0 .../expected/{ => bins_static}/stdio/fread.stdout | 0 .../{ => bins_static}/stdio/freopen.stderr | 0 .../{ => bins_static}/stdio/freopen.stdout | 0 .../expected/{ => bins_static}/stdio/fscanf.stderr | 0 .../expected/{ => bins_static}/stdio/fscanf.stdout | 0 .../{ => bins_static}/stdio/fscanf_offby1.stderr | 0 .../{ => bins_static}/stdio/fscanf_offby1.stdout | 0 .../expected/{ => bins_static}/stdio/fseek.stderr | 0 .../expected/{ => bins_static}/stdio/fseek.stdout | 0 .../expected/{ => bins_static}/stdio/fwrite.stderr | 0 .../expected/{ => bins_static}/stdio/fwrite.stdout | 0 .../{ => bins_static}/stdio/getc_unget.stderr | 0 .../{ => bins_static}/stdio/getc_unget.stdout | 0 .../expected/{ => bins_static}/stdio/mutex.stderr | 0 .../expected/{ => bins_static}/stdio/mutex.stdout | 0 .../expected/{ => bins_static}/stdio/popen.stderr | 0 .../expected/{ => bins_static}/stdio/popen.stdout | 0 .../expected/{ => bins_static}/stdio/printf.stderr | 0 .../expected/{ => bins_static}/stdio/printf.stdout | 0 .../{ => bins_static}/stdio/printf_neg_pad.stderr | 0 .../{ => bins_static}/stdio/printf_neg_pad.stdout | 0 .../stdio/printf_space_pad.stderr | 0 .../stdio/printf_space_pad.stdout | 0 .../expected/{ => bins_static}/stdio/rename.stderr | 0 .../expected/{ => bins_static}/stdio/rename.stdout | 0 .../expected/{ => bins_static}/stdio/scanf.stderr | 0 .../expected/{ => bins_static}/stdio/scanf.stdout | 0 .../{ => bins_static}/stdio/setvbuf.stderr | 0 .../{ => bins_static}/stdio/setvbuf.stdout | 0 .../{ => bins_static}/stdio/sprintf.stderr | 0 .../{ => bins_static}/stdio/sprintf.stdout | 0 .../{ => bins_static}/stdio/ungetc_ftell.stderr | 0 .../{ => bins_static}/stdio/ungetc_ftell.stdout | 0 .../{ => bins_static}/stdio/ungetc_multiple.stderr | 0 .../{ => bins_static}/stdio/ungetc_multiple.stdout | 0 .../expected/{ => bins_static}/stdlib/a64l.stderr | 0 .../expected/{ => bins_static}/stdlib/a64l.stdout | 0 .../expected/{ => bins_static}/stdlib/alloc.stderr | 0 .../expected/{ => bins_static}/stdlib/alloc.stdout | 0 .../expected/{ => bins_static}/stdlib/atof.stderr | 0 .../expected/{ => bins_static}/stdlib/atof.stdout | 0 .../expected/{ => bins_static}/stdlib/atoi.stderr | 0 .../expected/{ => bins_static}/stdlib/atoi.stdout | 0 tests/expected/{ => bins_static}/stdlib/div.stderr | 0 tests/expected/{ => bins_static}/stdlib/div.stdout | 0 tests/expected/{ => bins_static}/stdlib/env.stderr | 0 tests/expected/{ => bins_static}/stdlib/env.stdout | 0 .../{ => bins_static}/stdlib/mkostemps.stderr | 0 .../{ => bins_static}/stdlib/mkostemps.stdout | 0 .../expected/{ => bins_static}/stdlib/rand.stderr | 0 .../expected/{ => bins_static}/stdlib/rand.stdout | 0 .../{ => bins_static}/stdlib/rand48.stderr | 0 .../{ => bins_static}/stdlib/rand48.stdout | 0 .../{ => bins_static}/stdlib/random.stderr | 0 .../{ => bins_static}/stdlib/random.stdout | 0 .../{ => bins_static}/stdlib/strtod.stderr | 0 .../{ => bins_static}/stdlib/strtod.stdout | 0 .../{ => bins_static}/stdlib/strtol.stderr | 0 .../{ => bins_static}/stdlib/strtol.stdout | 0 .../{ => bins_static}/stdlib/strtoul.stderr | 0 .../{ => bins_static}/stdlib/strtoul.stdout | 0 .../{ => bins_static}/stdlib/system.stderr | 0 .../{ => bins_static}/stdlib/system.stdout | 0 tests/expected/{ => bins_static}/string/mem.stderr | 0 tests/expected/{ => bins_static}/string/mem.stdout | 0 .../{ => bins_static}/string/strcat.stderr | 0 .../{ => bins_static}/string/strcat.stdout | 0 .../{ => bins_static}/string/strchr.stderr | 0 .../{ => bins_static}/string/strchr.stdout | 0 .../{ => bins_static}/string/strcpy.stderr | 0 .../{ => bins_static}/string/strcpy.stdout | 0 .../{ => bins_static}/string/strcspn.stderr | 0 .../{ => bins_static}/string/strcspn.stdout | 0 .../{ => bins_static}/string/strlen.stderr | 0 .../{ => bins_static}/string/strlen.stdout | 0 .../{ => bins_static}/string/strncmp.stderr | 0 .../{ => bins_static}/string/strncmp.stdout | 0 .../{ => bins_static}/string/strpbrk.stderr | 0 .../{ => bins_static}/string/strpbrk.stdout | 0 .../{ => bins_static}/string/strrchr.stderr | 0 .../{ => bins_static}/string/strrchr.stdout | 0 .../{ => bins_static}/string/strsignal.stderr | 0 .../{ => bins_static}/string/strsignal.stdout | 0 .../{ => bins_static}/string/strspn.stderr | 0 .../{ => bins_static}/string/strspn.stdout | 0 .../{ => bins_static}/string/strstr.stderr | 0 .../{ => bins_static}/string/strstr.stdout | 0 .../{ => bins_static}/string/strtok.stderr | 0 .../{ => bins_static}/string/strtok.stdout | 0 .../{ => bins_static}/string/strtok_r.stderr | 0 .../{ => bins_static}/string/strtok_r.stdout | 0 tests/expected/{ => bins_static}/strings.stderr | 0 tests/expected/{ => bins_static}/strings.stdout | 0 tests/expected/{ => bins_static}/sys_mman.stderr | 0 tests/expected/{ => bins_static}/sys_mman.stdout | 0 .../expected/{ => bins_static}/time/asctime.stderr | 0 .../expected/{ => bins_static}/time/asctime.stdout | 0 .../{ => bins_static}/time/constants.stderr | 0 .../{ => bins_static}/time/constants.stdout | 0 .../expected/{ => bins_static}/time/gmtime.stderr | 0 .../expected/{ => bins_static}/time/gmtime.stdout | 0 .../{ => bins_static}/time/localtime.stderr | 0 .../{ => bins_static}/time/localtime.stdout | 0 .../expected/{ => bins_static}/time/macros.stderr | 0 .../expected/{ => bins_static}/time/macros.stdout | 0 .../expected/{ => bins_static}/time/mktime.stderr | 0 .../expected/{ => bins_static}/time/mktime.stdout | 0 .../{ => bins_static}/time/strftime.stderr | 0 .../{ => bins_static}/time/strftime.stdout | 0 tests/expected/{ => bins_static}/time/time.stderr | 0 tests/expected/{ => bins_static}/time/time.stdout | 0 tests/expected/{ => bins_static}/tls.stderr | 0 tests/expected/{ => bins_static}/tls.stdout | 0 .../{ => bins_static}/unistd/access.stderr | 0 .../{ => bins_static}/unistd/access.stdout | 0 tests/expected/{ => bins_static}/unistd/brk.stderr | 0 tests/expected/{ => bins_static}/unistd/brk.stdout | 0 tests/expected/{ => bins_static}/unistd/dup.stderr | 0 tests/expected/{ => bins_static}/unistd/dup.stdout | 0 .../expected/{ => bins_static}/unistd/exec.stderr | 0 .../expected/{ => bins_static}/unistd/exec.stdout | 0 .../{ => bins_static}/unistd/fchdir.stderr | 0 .../{ => bins_static}/unistd/fchdir.stdout | 0 .../expected/{ => bins_static}/unistd/fork.stderr | 0 .../expected/{ => bins_static}/unistd/fork.stdout | 0 .../expected/{ => bins_static}/unistd/fsync.stderr | 0 .../expected/{ => bins_static}/unistd/fsync.stdout | 0 .../{ => bins_static}/unistd/ftruncate.stderr | 0 .../{ => bins_static}/unistd/ftruncate.stdout | 0 .../{ => bins_static}/unistd/getopt.stderr | 0 .../{ => bins_static}/unistd/getopt.stdout | 0 .../{ => bins_static}/unistd/getopt_long.stderr | 0 .../{ => bins_static}/unistd/getopt_long.stdout | 0 .../expected/{ => bins_static}/unistd/pipe.stderr | 0 .../expected/{ => bins_static}/unistd/pipe.stdout | 0 .../expected/{ => bins_static}/unistd/rmdir.stderr | 0 .../expected/{ => bins_static}/unistd/rmdir.stdout | 0 .../expected/{ => bins_static}/unistd/sleep.stderr | 0 .../expected/{ => bins_static}/unistd/sleep.stdout | 0 .../expected/{ => bins_static}/unistd/swab.stderr | 0 .../expected/{ => bins_static}/unistd/swab.stdout | 0 .../expected/{ => bins_static}/unistd/write.stderr | 0 .../expected/{ => bins_static}/unistd/write.stdout | 0 tests/expected/{ => bins_static}/waitpid.stderr | 0 tests/expected/{ => bins_static}/waitpid.stdout | 0 .../expected/{ => bins_static}/wchar/fwide.stderr | 0 .../expected/{ => bins_static}/wchar/fwide.stdout | 0 .../{ => bins_static}/wchar/mbrtowc.stderr | 0 .../{ => bins_static}/wchar/mbrtowc.stdout | 0 .../{ => bins_static}/wchar/mbsrtowcs.stderr | 0 .../{ => bins_static}/wchar/mbsrtowcs.stdout | 0 .../wchar/printf-on-wchars.stderr | 0 .../wchar/printf-on-wchars.stdout | 0 .../{ => bins_static}/wchar/putwchar.stderr | 0 .../{ => bins_static}/wchar/putwchar.stdout | 0 .../{ => bins_static}/wchar/wcrtomb.stderr | 0 .../{ => bins_static}/wchar/wcrtomb.stdout | 0 .../{ => bins_static}/wchar/wcscasecmp.stderr | 0 .../{ => bins_static}/wchar/wcscasecmp.stdout | 0 .../{ => bins_static}/wchar/wcscspn.stderr | 0 .../{ => bins_static}/wchar/wcscspn.stdout | 0 .../{ => bins_static}/wchar/wcsncasecmp.stderr | 0 .../{ => bins_static}/wchar/wcsncasecmp.stdout | 0 .../{ => bins_static}/wchar/wcsrchr.stderr | 0 .../{ => bins_static}/wchar/wcsrchr.stdout | 0 .../expected/{ => bins_static}/wchar/wcsstr.stderr | 0 .../expected/{ => bins_static}/wchar/wcsstr.stdout | 0 .../expected/{ => bins_static}/wchar/wcstod.stderr | 0 .../expected/{ => bins_static}/wchar/wcstod.stdout | 0 .../expected/{ => bins_static}/wchar/wcstok.stderr | 0 .../expected/{ => bins_static}/wchar/wcstok.stdout | 0 .../expected/{ => bins_static}/wchar/wcstol.stderr | 0 .../expected/{ => bins_static}/wchar/wcstol.stdout | 0 .../wchar/wcswidth.stderr} | 0 tests/expected/bins_static/wchar/wcswidth.stdout | 1 + .../{ => bins_static}/wctype/towlower.stderr | 0 .../{ => bins_static}/wctype/towlower.stdout | 0 .../{ => bins_static}/wctype/towupper.stderr | 0 .../{ => bins_static}/wctype/towupper.stdout | 0 tests/expected/dlfcn.stderr | 0 tests/expected/dlfcn.stdout | 6 ------ tests/expected/mkfifo.stderr | 0 tests/expected/mkfifo.stdout | 0 tests/expected/netdb/netdb.stderr | 0 tests/expected/netdb/netdb.stdout | 1 - tests/wchar/wcswidth.c | 10 ++++++++++ 244 files changed, 23 insertions(+), 17 deletions(-) delete mode 100644 tests/expected/bins_dynamic/args.stdout delete mode 100644 tests/expected/bins_dynamic/errno.stderr delete mode 100644 tests/expected/bins_dynamic/errno.stdout rename tests/expected/{ => bins_static}/alloca.stderr (100%) rename tests/expected/{ => bins_static}/alloca.stdout (100%) rename tests/expected/{ => bins_static}/arpainet.stderr (100%) rename tests/expected/{ => bins_static}/arpainet.stdout (100%) rename tests/expected/{ => bins_static}/assert.stderr (100%) rename tests/expected/{ => bins_static}/assert.stdout (100%) rename tests/expected/{ => bins_static}/constructor.stderr (100%) rename tests/expected/{ => bins_static}/constructor.stdout (100%) rename tests/expected/{ => bins_static}/ctype.stderr (100%) rename tests/expected/{ => bins_static}/ctype.stdout (100%) rename tests/expected/{ => bins_static}/destructor.stderr (100%) rename tests/expected/{ => bins_static}/destructor.stdout (100%) rename tests/expected/{ => bins_static}/dirent/scandir.stderr (100%) rename tests/expected/{ => bins_static}/dirent/scandir.stdout (100%) rename tests/expected/{ => bins_static}/error.stderr (100%) rename tests/expected/{ => bins_static}/error.stdout (100%) rename tests/expected/{ => bins_static}/fcntl/create.stderr (100%) rename tests/expected/{ => bins_static}/fcntl/create.stdout (100%) rename tests/expected/{ => bins_static}/fcntl/fcntl.stderr (100%) rename tests/expected/{ => bins_static}/fcntl/fcntl.stdout (100%) rename tests/expected/{ => bins_static}/fnmatch.stderr (100%) rename tests/expected/{ => bins_static}/fnmatch.stdout (100%) rename tests/expected/{ => bins_static}/futimens.stderr (100%) rename tests/expected/{ => bins_static}/futimens.stdout (100%) rename tests/expected/{ => bins_static}/libgen.stderr (100%) rename tests/expected/{ => bins_static}/libgen.stdout (100%) rename tests/expected/{ => bins_static}/locale.stderr (100%) rename tests/expected/{ => bins_static}/locale.stdout (100%) rename tests/expected/{ => bins_static}/math.stderr (100%) rename tests/expected/{ => bins_static}/math.stdout (100%) rename tests/expected/{ => bins_static}/netdb/getaddrinfo.stderr (100%) rename tests/expected/{ => bins_static}/netdb/getaddrinfo.stdout (100%) rename tests/expected/{ => bins_static}/ptrace.stderr (100%) rename tests/expected/{ => bins_static}/ptrace.stdout (100%) rename tests/expected/{ => bins_static}/regex.stderr (100%) rename tests/expected/{ => bins_static}/regex.stdout (100%) rename tests/expected/{ => bins_static}/select.stderr (100%) rename tests/expected/{ => bins_static}/select.stdout (100%) rename tests/expected/{ => bins_static}/setjmp.stderr (100%) rename tests/expected/{ => bins_static}/setjmp.stdout (100%) rename tests/expected/{ => bins_static}/sigaction.stderr (100%) rename tests/expected/{ => bins_static}/sigaction.stdout (100%) rename tests/expected/{ => bins_static}/signal.stderr (100%) rename tests/expected/{ => bins_static}/signal.stdout (100%) rename tests/expected/{ => bins_static}/stdio/all.stderr (100%) rename tests/expected/{ => bins_static}/stdio/all.stdout (100%) rename tests/expected/{ => bins_static}/stdio/buffer.stderr (100%) rename tests/expected/{ => bins_static}/stdio/buffer.stdout (100%) rename tests/expected/{ => bins_static}/stdio/fgets.stderr (100%) rename tests/expected/{ => bins_static}/stdio/fgets.stdout (100%) rename tests/expected/{ => bins_static}/stdio/fputs.stderr (100%) rename tests/expected/{ => bins_static}/stdio/fputs.stdout (100%) rename tests/expected/{ => bins_static}/stdio/fread.stderr (100%) rename tests/expected/{ => bins_static}/stdio/fread.stdout (100%) rename tests/expected/{ => bins_static}/stdio/freopen.stderr (100%) rename tests/expected/{ => bins_static}/stdio/freopen.stdout (100%) rename tests/expected/{ => bins_static}/stdio/fscanf.stderr (100%) rename tests/expected/{ => bins_static}/stdio/fscanf.stdout (100%) rename tests/expected/{ => bins_static}/stdio/fscanf_offby1.stderr (100%) rename tests/expected/{ => bins_static}/stdio/fscanf_offby1.stdout (100%) rename tests/expected/{ => bins_static}/stdio/fseek.stderr (100%) rename tests/expected/{ => bins_static}/stdio/fseek.stdout (100%) rename tests/expected/{ => bins_static}/stdio/fwrite.stderr (100%) rename tests/expected/{ => bins_static}/stdio/fwrite.stdout (100%) rename tests/expected/{ => bins_static}/stdio/getc_unget.stderr (100%) rename tests/expected/{ => bins_static}/stdio/getc_unget.stdout (100%) rename tests/expected/{ => bins_static}/stdio/mutex.stderr (100%) rename tests/expected/{ => bins_static}/stdio/mutex.stdout (100%) rename tests/expected/{ => bins_static}/stdio/popen.stderr (100%) rename tests/expected/{ => bins_static}/stdio/popen.stdout (100%) rename tests/expected/{ => bins_static}/stdio/printf.stderr (100%) rename tests/expected/{ => bins_static}/stdio/printf.stdout (100%) rename tests/expected/{ => bins_static}/stdio/printf_neg_pad.stderr (100%) rename tests/expected/{ => bins_static}/stdio/printf_neg_pad.stdout (100%) rename tests/expected/{ => bins_static}/stdio/printf_space_pad.stderr (100%) rename tests/expected/{ => bins_static}/stdio/printf_space_pad.stdout (100%) rename tests/expected/{ => bins_static}/stdio/rename.stderr (100%) rename tests/expected/{ => bins_static}/stdio/rename.stdout (100%) rename tests/expected/{ => bins_static}/stdio/scanf.stderr (100%) rename tests/expected/{ => bins_static}/stdio/scanf.stdout (100%) rename tests/expected/{ => bins_static}/stdio/setvbuf.stderr (100%) rename tests/expected/{ => bins_static}/stdio/setvbuf.stdout (100%) rename tests/expected/{ => bins_static}/stdio/sprintf.stderr (100%) rename tests/expected/{ => bins_static}/stdio/sprintf.stdout (100%) rename tests/expected/{ => bins_static}/stdio/ungetc_ftell.stderr (100%) rename tests/expected/{ => bins_static}/stdio/ungetc_ftell.stdout (100%) rename tests/expected/{ => bins_static}/stdio/ungetc_multiple.stderr (100%) rename tests/expected/{ => bins_static}/stdio/ungetc_multiple.stdout (100%) rename tests/expected/{ => bins_static}/stdlib/a64l.stderr (100%) rename tests/expected/{ => bins_static}/stdlib/a64l.stdout (100%) rename tests/expected/{ => bins_static}/stdlib/alloc.stderr (100%) rename tests/expected/{ => bins_static}/stdlib/alloc.stdout (100%) rename tests/expected/{ => bins_static}/stdlib/atof.stderr (100%) rename tests/expected/{ => bins_static}/stdlib/atof.stdout (100%) rename tests/expected/{ => bins_static}/stdlib/atoi.stderr (100%) rename tests/expected/{ => bins_static}/stdlib/atoi.stdout (100%) rename tests/expected/{ => bins_static}/stdlib/div.stderr (100%) rename tests/expected/{ => bins_static}/stdlib/div.stdout (100%) rename tests/expected/{ => bins_static}/stdlib/env.stderr (100%) rename tests/expected/{ => bins_static}/stdlib/env.stdout (100%) rename tests/expected/{ => bins_static}/stdlib/mkostemps.stderr (100%) rename tests/expected/{ => bins_static}/stdlib/mkostemps.stdout (100%) rename tests/expected/{ => bins_static}/stdlib/rand.stderr (100%) rename tests/expected/{ => bins_static}/stdlib/rand.stdout (100%) rename tests/expected/{ => bins_static}/stdlib/rand48.stderr (100%) rename tests/expected/{ => bins_static}/stdlib/rand48.stdout (100%) rename tests/expected/{ => bins_static}/stdlib/random.stderr (100%) rename tests/expected/{ => bins_static}/stdlib/random.stdout (100%) rename tests/expected/{ => bins_static}/stdlib/strtod.stderr (100%) rename tests/expected/{ => bins_static}/stdlib/strtod.stdout (100%) rename tests/expected/{ => bins_static}/stdlib/strtol.stderr (100%) rename tests/expected/{ => bins_static}/stdlib/strtol.stdout (100%) rename tests/expected/{ => bins_static}/stdlib/strtoul.stderr (100%) rename tests/expected/{ => bins_static}/stdlib/strtoul.stdout (100%) rename tests/expected/{ => bins_static}/stdlib/system.stderr (100%) rename tests/expected/{ => bins_static}/stdlib/system.stdout (100%) rename tests/expected/{ => bins_static}/string/mem.stderr (100%) rename tests/expected/{ => bins_static}/string/mem.stdout (100%) rename tests/expected/{ => bins_static}/string/strcat.stderr (100%) rename tests/expected/{ => bins_static}/string/strcat.stdout (100%) rename tests/expected/{ => bins_static}/string/strchr.stderr (100%) rename tests/expected/{ => bins_static}/string/strchr.stdout (100%) rename tests/expected/{ => bins_static}/string/strcpy.stderr (100%) rename tests/expected/{ => bins_static}/string/strcpy.stdout (100%) rename tests/expected/{ => bins_static}/string/strcspn.stderr (100%) rename tests/expected/{ => bins_static}/string/strcspn.stdout (100%) rename tests/expected/{ => bins_static}/string/strlen.stderr (100%) rename tests/expected/{ => bins_static}/string/strlen.stdout (100%) rename tests/expected/{ => bins_static}/string/strncmp.stderr (100%) rename tests/expected/{ => bins_static}/string/strncmp.stdout (100%) rename tests/expected/{ => bins_static}/string/strpbrk.stderr (100%) rename tests/expected/{ => bins_static}/string/strpbrk.stdout (100%) rename tests/expected/{ => bins_static}/string/strrchr.stderr (100%) rename tests/expected/{ => bins_static}/string/strrchr.stdout (100%) rename tests/expected/{ => bins_static}/string/strsignal.stderr (100%) rename tests/expected/{ => bins_static}/string/strsignal.stdout (100%) rename tests/expected/{ => bins_static}/string/strspn.stderr (100%) rename tests/expected/{ => bins_static}/string/strspn.stdout (100%) rename tests/expected/{ => bins_static}/string/strstr.stderr (100%) rename tests/expected/{ => bins_static}/string/strstr.stdout (100%) rename tests/expected/{ => bins_static}/string/strtok.stderr (100%) rename tests/expected/{ => bins_static}/string/strtok.stdout (100%) rename tests/expected/{ => bins_static}/string/strtok_r.stderr (100%) rename tests/expected/{ => bins_static}/string/strtok_r.stdout (100%) rename tests/expected/{ => bins_static}/strings.stderr (100%) rename tests/expected/{ => bins_static}/strings.stdout (100%) rename tests/expected/{ => bins_static}/sys_mman.stderr (100%) rename tests/expected/{ => bins_static}/sys_mman.stdout (100%) rename tests/expected/{ => bins_static}/time/asctime.stderr (100%) rename tests/expected/{ => bins_static}/time/asctime.stdout (100%) rename tests/expected/{ => bins_static}/time/constants.stderr (100%) rename tests/expected/{ => bins_static}/time/constants.stdout (100%) rename tests/expected/{ => bins_static}/time/gmtime.stderr (100%) rename tests/expected/{ => bins_static}/time/gmtime.stdout (100%) rename tests/expected/{ => bins_static}/time/localtime.stderr (100%) rename tests/expected/{ => bins_static}/time/localtime.stdout (100%) rename tests/expected/{ => bins_static}/time/macros.stderr (100%) rename tests/expected/{ => bins_static}/time/macros.stdout (100%) rename tests/expected/{ => bins_static}/time/mktime.stderr (100%) rename tests/expected/{ => bins_static}/time/mktime.stdout (100%) rename tests/expected/{ => bins_static}/time/strftime.stderr (100%) rename tests/expected/{ => bins_static}/time/strftime.stdout (100%) rename tests/expected/{ => bins_static}/time/time.stderr (100%) rename tests/expected/{ => bins_static}/time/time.stdout (100%) rename tests/expected/{ => bins_static}/tls.stderr (100%) rename tests/expected/{ => bins_static}/tls.stdout (100%) rename tests/expected/{ => bins_static}/unistd/access.stderr (100%) rename tests/expected/{ => bins_static}/unistd/access.stdout (100%) rename tests/expected/{ => bins_static}/unistd/brk.stderr (100%) rename tests/expected/{ => bins_static}/unistd/brk.stdout (100%) rename tests/expected/{ => bins_static}/unistd/dup.stderr (100%) rename tests/expected/{ => bins_static}/unistd/dup.stdout (100%) rename tests/expected/{ => bins_static}/unistd/exec.stderr (100%) rename tests/expected/{ => bins_static}/unistd/exec.stdout (100%) rename tests/expected/{ => bins_static}/unistd/fchdir.stderr (100%) rename tests/expected/{ => bins_static}/unistd/fchdir.stdout (100%) rename tests/expected/{ => bins_static}/unistd/fork.stderr (100%) rename tests/expected/{ => bins_static}/unistd/fork.stdout (100%) rename tests/expected/{ => bins_static}/unistd/fsync.stderr (100%) rename tests/expected/{ => bins_static}/unistd/fsync.stdout (100%) rename tests/expected/{ => bins_static}/unistd/ftruncate.stderr (100%) rename tests/expected/{ => bins_static}/unistd/ftruncate.stdout (100%) rename tests/expected/{ => bins_static}/unistd/getopt.stderr (100%) rename tests/expected/{ => bins_static}/unistd/getopt.stdout (100%) rename tests/expected/{ => bins_static}/unistd/getopt_long.stderr (100%) rename tests/expected/{ => bins_static}/unistd/getopt_long.stdout (100%) rename tests/expected/{ => bins_static}/unistd/pipe.stderr (100%) rename tests/expected/{ => bins_static}/unistd/pipe.stdout (100%) rename tests/expected/{ => bins_static}/unistd/rmdir.stderr (100%) rename tests/expected/{ => bins_static}/unistd/rmdir.stdout (100%) rename tests/expected/{ => bins_static}/unistd/sleep.stderr (100%) rename tests/expected/{ => bins_static}/unistd/sleep.stdout (100%) rename tests/expected/{ => bins_static}/unistd/swab.stderr (100%) rename tests/expected/{ => bins_static}/unistd/swab.stdout (100%) rename tests/expected/{ => bins_static}/unistd/write.stderr (100%) rename tests/expected/{ => bins_static}/unistd/write.stdout (100%) rename tests/expected/{ => bins_static}/waitpid.stderr (100%) rename tests/expected/{ => bins_static}/waitpid.stdout (100%) rename tests/expected/{ => bins_static}/wchar/fwide.stderr (100%) rename tests/expected/{ => bins_static}/wchar/fwide.stdout (100%) rename tests/expected/{ => bins_static}/wchar/mbrtowc.stderr (100%) rename tests/expected/{ => bins_static}/wchar/mbrtowc.stdout (100%) rename tests/expected/{ => bins_static}/wchar/mbsrtowcs.stderr (100%) rename tests/expected/{ => bins_static}/wchar/mbsrtowcs.stdout (100%) rename tests/expected/{ => bins_static}/wchar/printf-on-wchars.stderr (100%) rename tests/expected/{ => bins_static}/wchar/printf-on-wchars.stdout (100%) rename tests/expected/{ => bins_static}/wchar/putwchar.stderr (100%) rename tests/expected/{ => bins_static}/wchar/putwchar.stdout (100%) rename tests/expected/{ => bins_static}/wchar/wcrtomb.stderr (100%) rename tests/expected/{ => bins_static}/wchar/wcrtomb.stdout (100%) rename tests/expected/{ => bins_static}/wchar/wcscasecmp.stderr (100%) rename tests/expected/{ => bins_static}/wchar/wcscasecmp.stdout (100%) rename tests/expected/{ => bins_static}/wchar/wcscspn.stderr (100%) rename tests/expected/{ => bins_static}/wchar/wcscspn.stdout (100%) rename tests/expected/{ => bins_static}/wchar/wcsncasecmp.stderr (100%) rename tests/expected/{ => bins_static}/wchar/wcsncasecmp.stdout (100%) rename tests/expected/{ => bins_static}/wchar/wcsrchr.stderr (100%) rename tests/expected/{ => bins_static}/wchar/wcsrchr.stdout (100%) rename tests/expected/{ => bins_static}/wchar/wcsstr.stderr (100%) rename tests/expected/{ => bins_static}/wchar/wcsstr.stdout (100%) rename tests/expected/{ => bins_static}/wchar/wcstod.stderr (100%) rename tests/expected/{ => bins_static}/wchar/wcstod.stdout (100%) rename tests/expected/{ => bins_static}/wchar/wcstok.stderr (100%) rename tests/expected/{ => bins_static}/wchar/wcstok.stdout (100%) rename tests/expected/{ => bins_static}/wchar/wcstol.stderr (100%) rename tests/expected/{ => bins_static}/wchar/wcstol.stdout (100%) rename tests/expected/{bins_dynamic/args.stderr => bins_static/wchar/wcswidth.stderr} (100%) create mode 100644 tests/expected/bins_static/wchar/wcswidth.stdout rename tests/expected/{ => bins_static}/wctype/towlower.stderr (100%) rename tests/expected/{ => bins_static}/wctype/towlower.stdout (100%) rename tests/expected/{ => bins_static}/wctype/towupper.stderr (100%) rename tests/expected/{ => bins_static}/wctype/towupper.stdout (100%) delete mode 100644 tests/expected/dlfcn.stderr delete mode 100644 tests/expected/dlfcn.stdout delete mode 100644 tests/expected/mkfifo.stderr delete mode 100644 tests/expected/mkfifo.stdout delete mode 100644 tests/expected/netdb/netdb.stderr delete mode 100644 tests/expected/netdb/netdb.stdout create mode 100644 tests/wchar/wcswidth.c diff --git a/src/header/wchar/mod.rs b/src/header/wchar/mod.rs index 93096dad9a..fd8e32d7e4 100644 --- a/src/header/wchar/mod.rs +++ b/src/header/wchar/mod.rs @@ -637,9 +637,17 @@ pub extern "C" fn wcswcs(ws1: *const wchar_t, ws2: *const wchar_t) -> *mut wchar unimplemented!(); } -// #[no_mangle] -pub extern "C" fn wcswidth(pwcs: *const wchar_t, n: size_t) -> c_int { - unimplemented!(); +#[no_mangle] +pub unsafe extern "C" fn wcswidth(pwcs: *const wchar_t, n: size_t) -> c_int { + let mut total_width = 0; + for i in 0..n { + let wc_width = wcwidth(*pwcs.add(i)); + if wc_width < 0 { + return -1; + } + total_width += wc_width; + } + total_width } // #[no_mangle] diff --git a/tests/Makefile b/tests/Makefile index 24774dfa54..4c08211820 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -115,6 +115,7 @@ EXPECT_NAMES=\ wchar/wcstol \ wchar/wcscasecmp \ wchar/wcsncasecmp \ + wchar/wcswidth \ wctype/towlower \ wctype/towupper # TODO: Fix these diff --git a/tests/expected/bins_dynamic/args.stdout b/tests/expected/bins_dynamic/args.stdout deleted file mode 100644 index 05c95c249b..0000000000 --- a/tests/expected/bins_dynamic/args.stdout +++ /dev/null @@ -1 +0,0 @@ -bins_dynamic/args test args diff --git a/tests/expected/bins_dynamic/errno.stderr b/tests/expected/bins_dynamic/errno.stderr deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/expected/bins_dynamic/errno.stdout b/tests/expected/bins_dynamic/errno.stdout deleted file mode 100644 index b3aff4878b..0000000000 --- a/tests/expected/bins_dynamic/errno.stdout +++ /dev/null @@ -1,6 +0,0 @@ -bins_dynamic/errno -bins_dynamic/errno -errno -yes, you can change this -yes, you can change this -yes, you can change this diff --git a/tests/expected/alloca.stderr b/tests/expected/bins_static/alloca.stderr similarity index 100% rename from tests/expected/alloca.stderr rename to tests/expected/bins_static/alloca.stderr diff --git a/tests/expected/alloca.stdout b/tests/expected/bins_static/alloca.stdout similarity index 100% rename from tests/expected/alloca.stdout rename to tests/expected/bins_static/alloca.stdout diff --git a/tests/expected/arpainet.stderr b/tests/expected/bins_static/arpainet.stderr similarity index 100% rename from tests/expected/arpainet.stderr rename to tests/expected/bins_static/arpainet.stderr diff --git a/tests/expected/arpainet.stdout b/tests/expected/bins_static/arpainet.stdout similarity index 100% rename from tests/expected/arpainet.stdout rename to tests/expected/bins_static/arpainet.stdout diff --git a/tests/expected/assert.stderr b/tests/expected/bins_static/assert.stderr similarity index 100% rename from tests/expected/assert.stderr rename to tests/expected/bins_static/assert.stderr diff --git a/tests/expected/assert.stdout b/tests/expected/bins_static/assert.stdout similarity index 100% rename from tests/expected/assert.stdout rename to tests/expected/bins_static/assert.stdout diff --git a/tests/expected/constructor.stderr b/tests/expected/bins_static/constructor.stderr similarity index 100% rename from tests/expected/constructor.stderr rename to tests/expected/bins_static/constructor.stderr diff --git a/tests/expected/constructor.stdout b/tests/expected/bins_static/constructor.stdout similarity index 100% rename from tests/expected/constructor.stdout rename to tests/expected/bins_static/constructor.stdout diff --git a/tests/expected/ctype.stderr b/tests/expected/bins_static/ctype.stderr similarity index 100% rename from tests/expected/ctype.stderr rename to tests/expected/bins_static/ctype.stderr diff --git a/tests/expected/ctype.stdout b/tests/expected/bins_static/ctype.stdout similarity index 100% rename from tests/expected/ctype.stdout rename to tests/expected/bins_static/ctype.stdout diff --git a/tests/expected/destructor.stderr b/tests/expected/bins_static/destructor.stderr similarity index 100% rename from tests/expected/destructor.stderr rename to tests/expected/bins_static/destructor.stderr diff --git a/tests/expected/destructor.stdout b/tests/expected/bins_static/destructor.stdout similarity index 100% rename from tests/expected/destructor.stdout rename to tests/expected/bins_static/destructor.stdout diff --git a/tests/expected/dirent/scandir.stderr b/tests/expected/bins_static/dirent/scandir.stderr similarity index 100% rename from tests/expected/dirent/scandir.stderr rename to tests/expected/bins_static/dirent/scandir.stderr diff --git a/tests/expected/dirent/scandir.stdout b/tests/expected/bins_static/dirent/scandir.stdout similarity index 100% rename from tests/expected/dirent/scandir.stdout rename to tests/expected/bins_static/dirent/scandir.stdout diff --git a/tests/expected/error.stderr b/tests/expected/bins_static/error.stderr similarity index 100% rename from tests/expected/error.stderr rename to tests/expected/bins_static/error.stderr diff --git a/tests/expected/error.stdout b/tests/expected/bins_static/error.stdout similarity index 100% rename from tests/expected/error.stdout rename to tests/expected/bins_static/error.stdout diff --git a/tests/expected/fcntl/create.stderr b/tests/expected/bins_static/fcntl/create.stderr similarity index 100% rename from tests/expected/fcntl/create.stderr rename to tests/expected/bins_static/fcntl/create.stderr diff --git a/tests/expected/fcntl/create.stdout b/tests/expected/bins_static/fcntl/create.stdout similarity index 100% rename from tests/expected/fcntl/create.stdout rename to tests/expected/bins_static/fcntl/create.stdout diff --git a/tests/expected/fcntl/fcntl.stderr b/tests/expected/bins_static/fcntl/fcntl.stderr similarity index 100% rename from tests/expected/fcntl/fcntl.stderr rename to tests/expected/bins_static/fcntl/fcntl.stderr diff --git a/tests/expected/fcntl/fcntl.stdout b/tests/expected/bins_static/fcntl/fcntl.stdout similarity index 100% rename from tests/expected/fcntl/fcntl.stdout rename to tests/expected/bins_static/fcntl/fcntl.stdout diff --git a/tests/expected/fnmatch.stderr b/tests/expected/bins_static/fnmatch.stderr similarity index 100% rename from tests/expected/fnmatch.stderr rename to tests/expected/bins_static/fnmatch.stderr diff --git a/tests/expected/fnmatch.stdout b/tests/expected/bins_static/fnmatch.stdout similarity index 100% rename from tests/expected/fnmatch.stdout rename to tests/expected/bins_static/fnmatch.stdout diff --git a/tests/expected/futimens.stderr b/tests/expected/bins_static/futimens.stderr similarity index 100% rename from tests/expected/futimens.stderr rename to tests/expected/bins_static/futimens.stderr diff --git a/tests/expected/futimens.stdout b/tests/expected/bins_static/futimens.stdout similarity index 100% rename from tests/expected/futimens.stdout rename to tests/expected/bins_static/futimens.stdout diff --git a/tests/expected/libgen.stderr b/tests/expected/bins_static/libgen.stderr similarity index 100% rename from tests/expected/libgen.stderr rename to tests/expected/bins_static/libgen.stderr diff --git a/tests/expected/libgen.stdout b/tests/expected/bins_static/libgen.stdout similarity index 100% rename from tests/expected/libgen.stdout rename to tests/expected/bins_static/libgen.stdout diff --git a/tests/expected/locale.stderr b/tests/expected/bins_static/locale.stderr similarity index 100% rename from tests/expected/locale.stderr rename to tests/expected/bins_static/locale.stderr diff --git a/tests/expected/locale.stdout b/tests/expected/bins_static/locale.stdout similarity index 100% rename from tests/expected/locale.stdout rename to tests/expected/bins_static/locale.stdout diff --git a/tests/expected/math.stderr b/tests/expected/bins_static/math.stderr similarity index 100% rename from tests/expected/math.stderr rename to tests/expected/bins_static/math.stderr diff --git a/tests/expected/math.stdout b/tests/expected/bins_static/math.stdout similarity index 100% rename from tests/expected/math.stdout rename to tests/expected/bins_static/math.stdout diff --git a/tests/expected/netdb/getaddrinfo.stderr b/tests/expected/bins_static/netdb/getaddrinfo.stderr similarity index 100% rename from tests/expected/netdb/getaddrinfo.stderr rename to tests/expected/bins_static/netdb/getaddrinfo.stderr diff --git a/tests/expected/netdb/getaddrinfo.stdout b/tests/expected/bins_static/netdb/getaddrinfo.stdout similarity index 100% rename from tests/expected/netdb/getaddrinfo.stdout rename to tests/expected/bins_static/netdb/getaddrinfo.stdout diff --git a/tests/expected/ptrace.stderr b/tests/expected/bins_static/ptrace.stderr similarity index 100% rename from tests/expected/ptrace.stderr rename to tests/expected/bins_static/ptrace.stderr diff --git a/tests/expected/ptrace.stdout b/tests/expected/bins_static/ptrace.stdout similarity index 100% rename from tests/expected/ptrace.stdout rename to tests/expected/bins_static/ptrace.stdout diff --git a/tests/expected/regex.stderr b/tests/expected/bins_static/regex.stderr similarity index 100% rename from tests/expected/regex.stderr rename to tests/expected/bins_static/regex.stderr diff --git a/tests/expected/regex.stdout b/tests/expected/bins_static/regex.stdout similarity index 100% rename from tests/expected/regex.stdout rename to tests/expected/bins_static/regex.stdout diff --git a/tests/expected/select.stderr b/tests/expected/bins_static/select.stderr similarity index 100% rename from tests/expected/select.stderr rename to tests/expected/bins_static/select.stderr diff --git a/tests/expected/select.stdout b/tests/expected/bins_static/select.stdout similarity index 100% rename from tests/expected/select.stdout rename to tests/expected/bins_static/select.stdout diff --git a/tests/expected/setjmp.stderr b/tests/expected/bins_static/setjmp.stderr similarity index 100% rename from tests/expected/setjmp.stderr rename to tests/expected/bins_static/setjmp.stderr diff --git a/tests/expected/setjmp.stdout b/tests/expected/bins_static/setjmp.stdout similarity index 100% rename from tests/expected/setjmp.stdout rename to tests/expected/bins_static/setjmp.stdout diff --git a/tests/expected/sigaction.stderr b/tests/expected/bins_static/sigaction.stderr similarity index 100% rename from tests/expected/sigaction.stderr rename to tests/expected/bins_static/sigaction.stderr diff --git a/tests/expected/sigaction.stdout b/tests/expected/bins_static/sigaction.stdout similarity index 100% rename from tests/expected/sigaction.stdout rename to tests/expected/bins_static/sigaction.stdout diff --git a/tests/expected/signal.stderr b/tests/expected/bins_static/signal.stderr similarity index 100% rename from tests/expected/signal.stderr rename to tests/expected/bins_static/signal.stderr diff --git a/tests/expected/signal.stdout b/tests/expected/bins_static/signal.stdout similarity index 100% rename from tests/expected/signal.stdout rename to tests/expected/bins_static/signal.stdout diff --git a/tests/expected/stdio/all.stderr b/tests/expected/bins_static/stdio/all.stderr similarity index 100% rename from tests/expected/stdio/all.stderr rename to tests/expected/bins_static/stdio/all.stderr diff --git a/tests/expected/stdio/all.stdout b/tests/expected/bins_static/stdio/all.stdout similarity index 100% rename from tests/expected/stdio/all.stdout rename to tests/expected/bins_static/stdio/all.stdout diff --git a/tests/expected/stdio/buffer.stderr b/tests/expected/bins_static/stdio/buffer.stderr similarity index 100% rename from tests/expected/stdio/buffer.stderr rename to tests/expected/bins_static/stdio/buffer.stderr diff --git a/tests/expected/stdio/buffer.stdout b/tests/expected/bins_static/stdio/buffer.stdout similarity index 100% rename from tests/expected/stdio/buffer.stdout rename to tests/expected/bins_static/stdio/buffer.stdout diff --git a/tests/expected/stdio/fgets.stderr b/tests/expected/bins_static/stdio/fgets.stderr similarity index 100% rename from tests/expected/stdio/fgets.stderr rename to tests/expected/bins_static/stdio/fgets.stderr diff --git a/tests/expected/stdio/fgets.stdout b/tests/expected/bins_static/stdio/fgets.stdout similarity index 100% rename from tests/expected/stdio/fgets.stdout rename to tests/expected/bins_static/stdio/fgets.stdout diff --git a/tests/expected/stdio/fputs.stderr b/tests/expected/bins_static/stdio/fputs.stderr similarity index 100% rename from tests/expected/stdio/fputs.stderr rename to tests/expected/bins_static/stdio/fputs.stderr diff --git a/tests/expected/stdio/fputs.stdout b/tests/expected/bins_static/stdio/fputs.stdout similarity index 100% rename from tests/expected/stdio/fputs.stdout rename to tests/expected/bins_static/stdio/fputs.stdout diff --git a/tests/expected/stdio/fread.stderr b/tests/expected/bins_static/stdio/fread.stderr similarity index 100% rename from tests/expected/stdio/fread.stderr rename to tests/expected/bins_static/stdio/fread.stderr diff --git a/tests/expected/stdio/fread.stdout b/tests/expected/bins_static/stdio/fread.stdout similarity index 100% rename from tests/expected/stdio/fread.stdout rename to tests/expected/bins_static/stdio/fread.stdout diff --git a/tests/expected/stdio/freopen.stderr b/tests/expected/bins_static/stdio/freopen.stderr similarity index 100% rename from tests/expected/stdio/freopen.stderr rename to tests/expected/bins_static/stdio/freopen.stderr diff --git a/tests/expected/stdio/freopen.stdout b/tests/expected/bins_static/stdio/freopen.stdout similarity index 100% rename from tests/expected/stdio/freopen.stdout rename to tests/expected/bins_static/stdio/freopen.stdout diff --git a/tests/expected/stdio/fscanf.stderr b/tests/expected/bins_static/stdio/fscanf.stderr similarity index 100% rename from tests/expected/stdio/fscanf.stderr rename to tests/expected/bins_static/stdio/fscanf.stderr diff --git a/tests/expected/stdio/fscanf.stdout b/tests/expected/bins_static/stdio/fscanf.stdout similarity index 100% rename from tests/expected/stdio/fscanf.stdout rename to tests/expected/bins_static/stdio/fscanf.stdout diff --git a/tests/expected/stdio/fscanf_offby1.stderr b/tests/expected/bins_static/stdio/fscanf_offby1.stderr similarity index 100% rename from tests/expected/stdio/fscanf_offby1.stderr rename to tests/expected/bins_static/stdio/fscanf_offby1.stderr diff --git a/tests/expected/stdio/fscanf_offby1.stdout b/tests/expected/bins_static/stdio/fscanf_offby1.stdout similarity index 100% rename from tests/expected/stdio/fscanf_offby1.stdout rename to tests/expected/bins_static/stdio/fscanf_offby1.stdout diff --git a/tests/expected/stdio/fseek.stderr b/tests/expected/bins_static/stdio/fseek.stderr similarity index 100% rename from tests/expected/stdio/fseek.stderr rename to tests/expected/bins_static/stdio/fseek.stderr diff --git a/tests/expected/stdio/fseek.stdout b/tests/expected/bins_static/stdio/fseek.stdout similarity index 100% rename from tests/expected/stdio/fseek.stdout rename to tests/expected/bins_static/stdio/fseek.stdout diff --git a/tests/expected/stdio/fwrite.stderr b/tests/expected/bins_static/stdio/fwrite.stderr similarity index 100% rename from tests/expected/stdio/fwrite.stderr rename to tests/expected/bins_static/stdio/fwrite.stderr diff --git a/tests/expected/stdio/fwrite.stdout b/tests/expected/bins_static/stdio/fwrite.stdout similarity index 100% rename from tests/expected/stdio/fwrite.stdout rename to tests/expected/bins_static/stdio/fwrite.stdout diff --git a/tests/expected/stdio/getc_unget.stderr b/tests/expected/bins_static/stdio/getc_unget.stderr similarity index 100% rename from tests/expected/stdio/getc_unget.stderr rename to tests/expected/bins_static/stdio/getc_unget.stderr diff --git a/tests/expected/stdio/getc_unget.stdout b/tests/expected/bins_static/stdio/getc_unget.stdout similarity index 100% rename from tests/expected/stdio/getc_unget.stdout rename to tests/expected/bins_static/stdio/getc_unget.stdout diff --git a/tests/expected/stdio/mutex.stderr b/tests/expected/bins_static/stdio/mutex.stderr similarity index 100% rename from tests/expected/stdio/mutex.stderr rename to tests/expected/bins_static/stdio/mutex.stderr diff --git a/tests/expected/stdio/mutex.stdout b/tests/expected/bins_static/stdio/mutex.stdout similarity index 100% rename from tests/expected/stdio/mutex.stdout rename to tests/expected/bins_static/stdio/mutex.stdout diff --git a/tests/expected/stdio/popen.stderr b/tests/expected/bins_static/stdio/popen.stderr similarity index 100% rename from tests/expected/stdio/popen.stderr rename to tests/expected/bins_static/stdio/popen.stderr diff --git a/tests/expected/stdio/popen.stdout b/tests/expected/bins_static/stdio/popen.stdout similarity index 100% rename from tests/expected/stdio/popen.stdout rename to tests/expected/bins_static/stdio/popen.stdout diff --git a/tests/expected/stdio/printf.stderr b/tests/expected/bins_static/stdio/printf.stderr similarity index 100% rename from tests/expected/stdio/printf.stderr rename to tests/expected/bins_static/stdio/printf.stderr diff --git a/tests/expected/stdio/printf.stdout b/tests/expected/bins_static/stdio/printf.stdout similarity index 100% rename from tests/expected/stdio/printf.stdout rename to tests/expected/bins_static/stdio/printf.stdout diff --git a/tests/expected/stdio/printf_neg_pad.stderr b/tests/expected/bins_static/stdio/printf_neg_pad.stderr similarity index 100% rename from tests/expected/stdio/printf_neg_pad.stderr rename to tests/expected/bins_static/stdio/printf_neg_pad.stderr diff --git a/tests/expected/stdio/printf_neg_pad.stdout b/tests/expected/bins_static/stdio/printf_neg_pad.stdout similarity index 100% rename from tests/expected/stdio/printf_neg_pad.stdout rename to tests/expected/bins_static/stdio/printf_neg_pad.stdout diff --git a/tests/expected/stdio/printf_space_pad.stderr b/tests/expected/bins_static/stdio/printf_space_pad.stderr similarity index 100% rename from tests/expected/stdio/printf_space_pad.stderr rename to tests/expected/bins_static/stdio/printf_space_pad.stderr diff --git a/tests/expected/stdio/printf_space_pad.stdout b/tests/expected/bins_static/stdio/printf_space_pad.stdout similarity index 100% rename from tests/expected/stdio/printf_space_pad.stdout rename to tests/expected/bins_static/stdio/printf_space_pad.stdout diff --git a/tests/expected/stdio/rename.stderr b/tests/expected/bins_static/stdio/rename.stderr similarity index 100% rename from tests/expected/stdio/rename.stderr rename to tests/expected/bins_static/stdio/rename.stderr diff --git a/tests/expected/stdio/rename.stdout b/tests/expected/bins_static/stdio/rename.stdout similarity index 100% rename from tests/expected/stdio/rename.stdout rename to tests/expected/bins_static/stdio/rename.stdout diff --git a/tests/expected/stdio/scanf.stderr b/tests/expected/bins_static/stdio/scanf.stderr similarity index 100% rename from tests/expected/stdio/scanf.stderr rename to tests/expected/bins_static/stdio/scanf.stderr diff --git a/tests/expected/stdio/scanf.stdout b/tests/expected/bins_static/stdio/scanf.stdout similarity index 100% rename from tests/expected/stdio/scanf.stdout rename to tests/expected/bins_static/stdio/scanf.stdout diff --git a/tests/expected/stdio/setvbuf.stderr b/tests/expected/bins_static/stdio/setvbuf.stderr similarity index 100% rename from tests/expected/stdio/setvbuf.stderr rename to tests/expected/bins_static/stdio/setvbuf.stderr diff --git a/tests/expected/stdio/setvbuf.stdout b/tests/expected/bins_static/stdio/setvbuf.stdout similarity index 100% rename from tests/expected/stdio/setvbuf.stdout rename to tests/expected/bins_static/stdio/setvbuf.stdout diff --git a/tests/expected/stdio/sprintf.stderr b/tests/expected/bins_static/stdio/sprintf.stderr similarity index 100% rename from tests/expected/stdio/sprintf.stderr rename to tests/expected/bins_static/stdio/sprintf.stderr diff --git a/tests/expected/stdio/sprintf.stdout b/tests/expected/bins_static/stdio/sprintf.stdout similarity index 100% rename from tests/expected/stdio/sprintf.stdout rename to tests/expected/bins_static/stdio/sprintf.stdout diff --git a/tests/expected/stdio/ungetc_ftell.stderr b/tests/expected/bins_static/stdio/ungetc_ftell.stderr similarity index 100% rename from tests/expected/stdio/ungetc_ftell.stderr rename to tests/expected/bins_static/stdio/ungetc_ftell.stderr diff --git a/tests/expected/stdio/ungetc_ftell.stdout b/tests/expected/bins_static/stdio/ungetc_ftell.stdout similarity index 100% rename from tests/expected/stdio/ungetc_ftell.stdout rename to tests/expected/bins_static/stdio/ungetc_ftell.stdout diff --git a/tests/expected/stdio/ungetc_multiple.stderr b/tests/expected/bins_static/stdio/ungetc_multiple.stderr similarity index 100% rename from tests/expected/stdio/ungetc_multiple.stderr rename to tests/expected/bins_static/stdio/ungetc_multiple.stderr diff --git a/tests/expected/stdio/ungetc_multiple.stdout b/tests/expected/bins_static/stdio/ungetc_multiple.stdout similarity index 100% rename from tests/expected/stdio/ungetc_multiple.stdout rename to tests/expected/bins_static/stdio/ungetc_multiple.stdout diff --git a/tests/expected/stdlib/a64l.stderr b/tests/expected/bins_static/stdlib/a64l.stderr similarity index 100% rename from tests/expected/stdlib/a64l.stderr rename to tests/expected/bins_static/stdlib/a64l.stderr diff --git a/tests/expected/stdlib/a64l.stdout b/tests/expected/bins_static/stdlib/a64l.stdout similarity index 100% rename from tests/expected/stdlib/a64l.stdout rename to tests/expected/bins_static/stdlib/a64l.stdout diff --git a/tests/expected/stdlib/alloc.stderr b/tests/expected/bins_static/stdlib/alloc.stderr similarity index 100% rename from tests/expected/stdlib/alloc.stderr rename to tests/expected/bins_static/stdlib/alloc.stderr diff --git a/tests/expected/stdlib/alloc.stdout b/tests/expected/bins_static/stdlib/alloc.stdout similarity index 100% rename from tests/expected/stdlib/alloc.stdout rename to tests/expected/bins_static/stdlib/alloc.stdout diff --git a/tests/expected/stdlib/atof.stderr b/tests/expected/bins_static/stdlib/atof.stderr similarity index 100% rename from tests/expected/stdlib/atof.stderr rename to tests/expected/bins_static/stdlib/atof.stderr diff --git a/tests/expected/stdlib/atof.stdout b/tests/expected/bins_static/stdlib/atof.stdout similarity index 100% rename from tests/expected/stdlib/atof.stdout rename to tests/expected/bins_static/stdlib/atof.stdout diff --git a/tests/expected/stdlib/atoi.stderr b/tests/expected/bins_static/stdlib/atoi.stderr similarity index 100% rename from tests/expected/stdlib/atoi.stderr rename to tests/expected/bins_static/stdlib/atoi.stderr diff --git a/tests/expected/stdlib/atoi.stdout b/tests/expected/bins_static/stdlib/atoi.stdout similarity index 100% rename from tests/expected/stdlib/atoi.stdout rename to tests/expected/bins_static/stdlib/atoi.stdout diff --git a/tests/expected/stdlib/div.stderr b/tests/expected/bins_static/stdlib/div.stderr similarity index 100% rename from tests/expected/stdlib/div.stderr rename to tests/expected/bins_static/stdlib/div.stderr diff --git a/tests/expected/stdlib/div.stdout b/tests/expected/bins_static/stdlib/div.stdout similarity index 100% rename from tests/expected/stdlib/div.stdout rename to tests/expected/bins_static/stdlib/div.stdout diff --git a/tests/expected/stdlib/env.stderr b/tests/expected/bins_static/stdlib/env.stderr similarity index 100% rename from tests/expected/stdlib/env.stderr rename to tests/expected/bins_static/stdlib/env.stderr diff --git a/tests/expected/stdlib/env.stdout b/tests/expected/bins_static/stdlib/env.stdout similarity index 100% rename from tests/expected/stdlib/env.stdout rename to tests/expected/bins_static/stdlib/env.stdout diff --git a/tests/expected/stdlib/mkostemps.stderr b/tests/expected/bins_static/stdlib/mkostemps.stderr similarity index 100% rename from tests/expected/stdlib/mkostemps.stderr rename to tests/expected/bins_static/stdlib/mkostemps.stderr diff --git a/tests/expected/stdlib/mkostemps.stdout b/tests/expected/bins_static/stdlib/mkostemps.stdout similarity index 100% rename from tests/expected/stdlib/mkostemps.stdout rename to tests/expected/bins_static/stdlib/mkostemps.stdout diff --git a/tests/expected/stdlib/rand.stderr b/tests/expected/bins_static/stdlib/rand.stderr similarity index 100% rename from tests/expected/stdlib/rand.stderr rename to tests/expected/bins_static/stdlib/rand.stderr diff --git a/tests/expected/stdlib/rand.stdout b/tests/expected/bins_static/stdlib/rand.stdout similarity index 100% rename from tests/expected/stdlib/rand.stdout rename to tests/expected/bins_static/stdlib/rand.stdout diff --git a/tests/expected/stdlib/rand48.stderr b/tests/expected/bins_static/stdlib/rand48.stderr similarity index 100% rename from tests/expected/stdlib/rand48.stderr rename to tests/expected/bins_static/stdlib/rand48.stderr diff --git a/tests/expected/stdlib/rand48.stdout b/tests/expected/bins_static/stdlib/rand48.stdout similarity index 100% rename from tests/expected/stdlib/rand48.stdout rename to tests/expected/bins_static/stdlib/rand48.stdout diff --git a/tests/expected/stdlib/random.stderr b/tests/expected/bins_static/stdlib/random.stderr similarity index 100% rename from tests/expected/stdlib/random.stderr rename to tests/expected/bins_static/stdlib/random.stderr diff --git a/tests/expected/stdlib/random.stdout b/tests/expected/bins_static/stdlib/random.stdout similarity index 100% rename from tests/expected/stdlib/random.stdout rename to tests/expected/bins_static/stdlib/random.stdout diff --git a/tests/expected/stdlib/strtod.stderr b/tests/expected/bins_static/stdlib/strtod.stderr similarity index 100% rename from tests/expected/stdlib/strtod.stderr rename to tests/expected/bins_static/stdlib/strtod.stderr diff --git a/tests/expected/stdlib/strtod.stdout b/tests/expected/bins_static/stdlib/strtod.stdout similarity index 100% rename from tests/expected/stdlib/strtod.stdout rename to tests/expected/bins_static/stdlib/strtod.stdout diff --git a/tests/expected/stdlib/strtol.stderr b/tests/expected/bins_static/stdlib/strtol.stderr similarity index 100% rename from tests/expected/stdlib/strtol.stderr rename to tests/expected/bins_static/stdlib/strtol.stderr diff --git a/tests/expected/stdlib/strtol.stdout b/tests/expected/bins_static/stdlib/strtol.stdout similarity index 100% rename from tests/expected/stdlib/strtol.stdout rename to tests/expected/bins_static/stdlib/strtol.stdout diff --git a/tests/expected/stdlib/strtoul.stderr b/tests/expected/bins_static/stdlib/strtoul.stderr similarity index 100% rename from tests/expected/stdlib/strtoul.stderr rename to tests/expected/bins_static/stdlib/strtoul.stderr diff --git a/tests/expected/stdlib/strtoul.stdout b/tests/expected/bins_static/stdlib/strtoul.stdout similarity index 100% rename from tests/expected/stdlib/strtoul.stdout rename to tests/expected/bins_static/stdlib/strtoul.stdout diff --git a/tests/expected/stdlib/system.stderr b/tests/expected/bins_static/stdlib/system.stderr similarity index 100% rename from tests/expected/stdlib/system.stderr rename to tests/expected/bins_static/stdlib/system.stderr diff --git a/tests/expected/stdlib/system.stdout b/tests/expected/bins_static/stdlib/system.stdout similarity index 100% rename from tests/expected/stdlib/system.stdout rename to tests/expected/bins_static/stdlib/system.stdout diff --git a/tests/expected/string/mem.stderr b/tests/expected/bins_static/string/mem.stderr similarity index 100% rename from tests/expected/string/mem.stderr rename to tests/expected/bins_static/string/mem.stderr diff --git a/tests/expected/string/mem.stdout b/tests/expected/bins_static/string/mem.stdout similarity index 100% rename from tests/expected/string/mem.stdout rename to tests/expected/bins_static/string/mem.stdout diff --git a/tests/expected/string/strcat.stderr b/tests/expected/bins_static/string/strcat.stderr similarity index 100% rename from tests/expected/string/strcat.stderr rename to tests/expected/bins_static/string/strcat.stderr diff --git a/tests/expected/string/strcat.stdout b/tests/expected/bins_static/string/strcat.stdout similarity index 100% rename from tests/expected/string/strcat.stdout rename to tests/expected/bins_static/string/strcat.stdout diff --git a/tests/expected/string/strchr.stderr b/tests/expected/bins_static/string/strchr.stderr similarity index 100% rename from tests/expected/string/strchr.stderr rename to tests/expected/bins_static/string/strchr.stderr diff --git a/tests/expected/string/strchr.stdout b/tests/expected/bins_static/string/strchr.stdout similarity index 100% rename from tests/expected/string/strchr.stdout rename to tests/expected/bins_static/string/strchr.stdout diff --git a/tests/expected/string/strcpy.stderr b/tests/expected/bins_static/string/strcpy.stderr similarity index 100% rename from tests/expected/string/strcpy.stderr rename to tests/expected/bins_static/string/strcpy.stderr diff --git a/tests/expected/string/strcpy.stdout b/tests/expected/bins_static/string/strcpy.stdout similarity index 100% rename from tests/expected/string/strcpy.stdout rename to tests/expected/bins_static/string/strcpy.stdout diff --git a/tests/expected/string/strcspn.stderr b/tests/expected/bins_static/string/strcspn.stderr similarity index 100% rename from tests/expected/string/strcspn.stderr rename to tests/expected/bins_static/string/strcspn.stderr diff --git a/tests/expected/string/strcspn.stdout b/tests/expected/bins_static/string/strcspn.stdout similarity index 100% rename from tests/expected/string/strcspn.stdout rename to tests/expected/bins_static/string/strcspn.stdout diff --git a/tests/expected/string/strlen.stderr b/tests/expected/bins_static/string/strlen.stderr similarity index 100% rename from tests/expected/string/strlen.stderr rename to tests/expected/bins_static/string/strlen.stderr diff --git a/tests/expected/string/strlen.stdout b/tests/expected/bins_static/string/strlen.stdout similarity index 100% rename from tests/expected/string/strlen.stdout rename to tests/expected/bins_static/string/strlen.stdout diff --git a/tests/expected/string/strncmp.stderr b/tests/expected/bins_static/string/strncmp.stderr similarity index 100% rename from tests/expected/string/strncmp.stderr rename to tests/expected/bins_static/string/strncmp.stderr diff --git a/tests/expected/string/strncmp.stdout b/tests/expected/bins_static/string/strncmp.stdout similarity index 100% rename from tests/expected/string/strncmp.stdout rename to tests/expected/bins_static/string/strncmp.stdout diff --git a/tests/expected/string/strpbrk.stderr b/tests/expected/bins_static/string/strpbrk.stderr similarity index 100% rename from tests/expected/string/strpbrk.stderr rename to tests/expected/bins_static/string/strpbrk.stderr diff --git a/tests/expected/string/strpbrk.stdout b/tests/expected/bins_static/string/strpbrk.stdout similarity index 100% rename from tests/expected/string/strpbrk.stdout rename to tests/expected/bins_static/string/strpbrk.stdout diff --git a/tests/expected/string/strrchr.stderr b/tests/expected/bins_static/string/strrchr.stderr similarity index 100% rename from tests/expected/string/strrchr.stderr rename to tests/expected/bins_static/string/strrchr.stderr diff --git a/tests/expected/string/strrchr.stdout b/tests/expected/bins_static/string/strrchr.stdout similarity index 100% rename from tests/expected/string/strrchr.stdout rename to tests/expected/bins_static/string/strrchr.stdout diff --git a/tests/expected/string/strsignal.stderr b/tests/expected/bins_static/string/strsignal.stderr similarity index 100% rename from tests/expected/string/strsignal.stderr rename to tests/expected/bins_static/string/strsignal.stderr diff --git a/tests/expected/string/strsignal.stdout b/tests/expected/bins_static/string/strsignal.stdout similarity index 100% rename from tests/expected/string/strsignal.stdout rename to tests/expected/bins_static/string/strsignal.stdout diff --git a/tests/expected/string/strspn.stderr b/tests/expected/bins_static/string/strspn.stderr similarity index 100% rename from tests/expected/string/strspn.stderr rename to tests/expected/bins_static/string/strspn.stderr diff --git a/tests/expected/string/strspn.stdout b/tests/expected/bins_static/string/strspn.stdout similarity index 100% rename from tests/expected/string/strspn.stdout rename to tests/expected/bins_static/string/strspn.stdout diff --git a/tests/expected/string/strstr.stderr b/tests/expected/bins_static/string/strstr.stderr similarity index 100% rename from tests/expected/string/strstr.stderr rename to tests/expected/bins_static/string/strstr.stderr diff --git a/tests/expected/string/strstr.stdout b/tests/expected/bins_static/string/strstr.stdout similarity index 100% rename from tests/expected/string/strstr.stdout rename to tests/expected/bins_static/string/strstr.stdout diff --git a/tests/expected/string/strtok.stderr b/tests/expected/bins_static/string/strtok.stderr similarity index 100% rename from tests/expected/string/strtok.stderr rename to tests/expected/bins_static/string/strtok.stderr diff --git a/tests/expected/string/strtok.stdout b/tests/expected/bins_static/string/strtok.stdout similarity index 100% rename from tests/expected/string/strtok.stdout rename to tests/expected/bins_static/string/strtok.stdout diff --git a/tests/expected/string/strtok_r.stderr b/tests/expected/bins_static/string/strtok_r.stderr similarity index 100% rename from tests/expected/string/strtok_r.stderr rename to tests/expected/bins_static/string/strtok_r.stderr diff --git a/tests/expected/string/strtok_r.stdout b/tests/expected/bins_static/string/strtok_r.stdout similarity index 100% rename from tests/expected/string/strtok_r.stdout rename to tests/expected/bins_static/string/strtok_r.stdout diff --git a/tests/expected/strings.stderr b/tests/expected/bins_static/strings.stderr similarity index 100% rename from tests/expected/strings.stderr rename to tests/expected/bins_static/strings.stderr diff --git a/tests/expected/strings.stdout b/tests/expected/bins_static/strings.stdout similarity index 100% rename from tests/expected/strings.stdout rename to tests/expected/bins_static/strings.stdout diff --git a/tests/expected/sys_mman.stderr b/tests/expected/bins_static/sys_mman.stderr similarity index 100% rename from tests/expected/sys_mman.stderr rename to tests/expected/bins_static/sys_mman.stderr diff --git a/tests/expected/sys_mman.stdout b/tests/expected/bins_static/sys_mman.stdout similarity index 100% rename from tests/expected/sys_mman.stdout rename to tests/expected/bins_static/sys_mman.stdout diff --git a/tests/expected/time/asctime.stderr b/tests/expected/bins_static/time/asctime.stderr similarity index 100% rename from tests/expected/time/asctime.stderr rename to tests/expected/bins_static/time/asctime.stderr diff --git a/tests/expected/time/asctime.stdout b/tests/expected/bins_static/time/asctime.stdout similarity index 100% rename from tests/expected/time/asctime.stdout rename to tests/expected/bins_static/time/asctime.stdout diff --git a/tests/expected/time/constants.stderr b/tests/expected/bins_static/time/constants.stderr similarity index 100% rename from tests/expected/time/constants.stderr rename to tests/expected/bins_static/time/constants.stderr diff --git a/tests/expected/time/constants.stdout b/tests/expected/bins_static/time/constants.stdout similarity index 100% rename from tests/expected/time/constants.stdout rename to tests/expected/bins_static/time/constants.stdout diff --git a/tests/expected/time/gmtime.stderr b/tests/expected/bins_static/time/gmtime.stderr similarity index 100% rename from tests/expected/time/gmtime.stderr rename to tests/expected/bins_static/time/gmtime.stderr diff --git a/tests/expected/time/gmtime.stdout b/tests/expected/bins_static/time/gmtime.stdout similarity index 100% rename from tests/expected/time/gmtime.stdout rename to tests/expected/bins_static/time/gmtime.stdout diff --git a/tests/expected/time/localtime.stderr b/tests/expected/bins_static/time/localtime.stderr similarity index 100% rename from tests/expected/time/localtime.stderr rename to tests/expected/bins_static/time/localtime.stderr diff --git a/tests/expected/time/localtime.stdout b/tests/expected/bins_static/time/localtime.stdout similarity index 100% rename from tests/expected/time/localtime.stdout rename to tests/expected/bins_static/time/localtime.stdout diff --git a/tests/expected/time/macros.stderr b/tests/expected/bins_static/time/macros.stderr similarity index 100% rename from tests/expected/time/macros.stderr rename to tests/expected/bins_static/time/macros.stderr diff --git a/tests/expected/time/macros.stdout b/tests/expected/bins_static/time/macros.stdout similarity index 100% rename from tests/expected/time/macros.stdout rename to tests/expected/bins_static/time/macros.stdout diff --git a/tests/expected/time/mktime.stderr b/tests/expected/bins_static/time/mktime.stderr similarity index 100% rename from tests/expected/time/mktime.stderr rename to tests/expected/bins_static/time/mktime.stderr diff --git a/tests/expected/time/mktime.stdout b/tests/expected/bins_static/time/mktime.stdout similarity index 100% rename from tests/expected/time/mktime.stdout rename to tests/expected/bins_static/time/mktime.stdout diff --git a/tests/expected/time/strftime.stderr b/tests/expected/bins_static/time/strftime.stderr similarity index 100% rename from tests/expected/time/strftime.stderr rename to tests/expected/bins_static/time/strftime.stderr diff --git a/tests/expected/time/strftime.stdout b/tests/expected/bins_static/time/strftime.stdout similarity index 100% rename from tests/expected/time/strftime.stdout rename to tests/expected/bins_static/time/strftime.stdout diff --git a/tests/expected/time/time.stderr b/tests/expected/bins_static/time/time.stderr similarity index 100% rename from tests/expected/time/time.stderr rename to tests/expected/bins_static/time/time.stderr diff --git a/tests/expected/time/time.stdout b/tests/expected/bins_static/time/time.stdout similarity index 100% rename from tests/expected/time/time.stdout rename to tests/expected/bins_static/time/time.stdout diff --git a/tests/expected/tls.stderr b/tests/expected/bins_static/tls.stderr similarity index 100% rename from tests/expected/tls.stderr rename to tests/expected/bins_static/tls.stderr diff --git a/tests/expected/tls.stdout b/tests/expected/bins_static/tls.stdout similarity index 100% rename from tests/expected/tls.stdout rename to tests/expected/bins_static/tls.stdout diff --git a/tests/expected/unistd/access.stderr b/tests/expected/bins_static/unistd/access.stderr similarity index 100% rename from tests/expected/unistd/access.stderr rename to tests/expected/bins_static/unistd/access.stderr diff --git a/tests/expected/unistd/access.stdout b/tests/expected/bins_static/unistd/access.stdout similarity index 100% rename from tests/expected/unistd/access.stdout rename to tests/expected/bins_static/unistd/access.stdout diff --git a/tests/expected/unistd/brk.stderr b/tests/expected/bins_static/unistd/brk.stderr similarity index 100% rename from tests/expected/unistd/brk.stderr rename to tests/expected/bins_static/unistd/brk.stderr diff --git a/tests/expected/unistd/brk.stdout b/tests/expected/bins_static/unistd/brk.stdout similarity index 100% rename from tests/expected/unistd/brk.stdout rename to tests/expected/bins_static/unistd/brk.stdout diff --git a/tests/expected/unistd/dup.stderr b/tests/expected/bins_static/unistd/dup.stderr similarity index 100% rename from tests/expected/unistd/dup.stderr rename to tests/expected/bins_static/unistd/dup.stderr diff --git a/tests/expected/unistd/dup.stdout b/tests/expected/bins_static/unistd/dup.stdout similarity index 100% rename from tests/expected/unistd/dup.stdout rename to tests/expected/bins_static/unistd/dup.stdout diff --git a/tests/expected/unistd/exec.stderr b/tests/expected/bins_static/unistd/exec.stderr similarity index 100% rename from tests/expected/unistd/exec.stderr rename to tests/expected/bins_static/unistd/exec.stderr diff --git a/tests/expected/unistd/exec.stdout b/tests/expected/bins_static/unistd/exec.stdout similarity index 100% rename from tests/expected/unistd/exec.stdout rename to tests/expected/bins_static/unistd/exec.stdout diff --git a/tests/expected/unistd/fchdir.stderr b/tests/expected/bins_static/unistd/fchdir.stderr similarity index 100% rename from tests/expected/unistd/fchdir.stderr rename to tests/expected/bins_static/unistd/fchdir.stderr diff --git a/tests/expected/unistd/fchdir.stdout b/tests/expected/bins_static/unistd/fchdir.stdout similarity index 100% rename from tests/expected/unistd/fchdir.stdout rename to tests/expected/bins_static/unistd/fchdir.stdout diff --git a/tests/expected/unistd/fork.stderr b/tests/expected/bins_static/unistd/fork.stderr similarity index 100% rename from tests/expected/unistd/fork.stderr rename to tests/expected/bins_static/unistd/fork.stderr diff --git a/tests/expected/unistd/fork.stdout b/tests/expected/bins_static/unistd/fork.stdout similarity index 100% rename from tests/expected/unistd/fork.stdout rename to tests/expected/bins_static/unistd/fork.stdout diff --git a/tests/expected/unistd/fsync.stderr b/tests/expected/bins_static/unistd/fsync.stderr similarity index 100% rename from tests/expected/unistd/fsync.stderr rename to tests/expected/bins_static/unistd/fsync.stderr diff --git a/tests/expected/unistd/fsync.stdout b/tests/expected/bins_static/unistd/fsync.stdout similarity index 100% rename from tests/expected/unistd/fsync.stdout rename to tests/expected/bins_static/unistd/fsync.stdout diff --git a/tests/expected/unistd/ftruncate.stderr b/tests/expected/bins_static/unistd/ftruncate.stderr similarity index 100% rename from tests/expected/unistd/ftruncate.stderr rename to tests/expected/bins_static/unistd/ftruncate.stderr diff --git a/tests/expected/unistd/ftruncate.stdout b/tests/expected/bins_static/unistd/ftruncate.stdout similarity index 100% rename from tests/expected/unistd/ftruncate.stdout rename to tests/expected/bins_static/unistd/ftruncate.stdout diff --git a/tests/expected/unistd/getopt.stderr b/tests/expected/bins_static/unistd/getopt.stderr similarity index 100% rename from tests/expected/unistd/getopt.stderr rename to tests/expected/bins_static/unistd/getopt.stderr diff --git a/tests/expected/unistd/getopt.stdout b/tests/expected/bins_static/unistd/getopt.stdout similarity index 100% rename from tests/expected/unistd/getopt.stdout rename to tests/expected/bins_static/unistd/getopt.stdout diff --git a/tests/expected/unistd/getopt_long.stderr b/tests/expected/bins_static/unistd/getopt_long.stderr similarity index 100% rename from tests/expected/unistd/getopt_long.stderr rename to tests/expected/bins_static/unistd/getopt_long.stderr diff --git a/tests/expected/unistd/getopt_long.stdout b/tests/expected/bins_static/unistd/getopt_long.stdout similarity index 100% rename from tests/expected/unistd/getopt_long.stdout rename to tests/expected/bins_static/unistd/getopt_long.stdout diff --git a/tests/expected/unistd/pipe.stderr b/tests/expected/bins_static/unistd/pipe.stderr similarity index 100% rename from tests/expected/unistd/pipe.stderr rename to tests/expected/bins_static/unistd/pipe.stderr diff --git a/tests/expected/unistd/pipe.stdout b/tests/expected/bins_static/unistd/pipe.stdout similarity index 100% rename from tests/expected/unistd/pipe.stdout rename to tests/expected/bins_static/unistd/pipe.stdout diff --git a/tests/expected/unistd/rmdir.stderr b/tests/expected/bins_static/unistd/rmdir.stderr similarity index 100% rename from tests/expected/unistd/rmdir.stderr rename to tests/expected/bins_static/unistd/rmdir.stderr diff --git a/tests/expected/unistd/rmdir.stdout b/tests/expected/bins_static/unistd/rmdir.stdout similarity index 100% rename from tests/expected/unistd/rmdir.stdout rename to tests/expected/bins_static/unistd/rmdir.stdout diff --git a/tests/expected/unistd/sleep.stderr b/tests/expected/bins_static/unistd/sleep.stderr similarity index 100% rename from tests/expected/unistd/sleep.stderr rename to tests/expected/bins_static/unistd/sleep.stderr diff --git a/tests/expected/unistd/sleep.stdout b/tests/expected/bins_static/unistd/sleep.stdout similarity index 100% rename from tests/expected/unistd/sleep.stdout rename to tests/expected/bins_static/unistd/sleep.stdout diff --git a/tests/expected/unistd/swab.stderr b/tests/expected/bins_static/unistd/swab.stderr similarity index 100% rename from tests/expected/unistd/swab.stderr rename to tests/expected/bins_static/unistd/swab.stderr diff --git a/tests/expected/unistd/swab.stdout b/tests/expected/bins_static/unistd/swab.stdout similarity index 100% rename from tests/expected/unistd/swab.stdout rename to tests/expected/bins_static/unistd/swab.stdout diff --git a/tests/expected/unistd/write.stderr b/tests/expected/bins_static/unistd/write.stderr similarity index 100% rename from tests/expected/unistd/write.stderr rename to tests/expected/bins_static/unistd/write.stderr diff --git a/tests/expected/unistd/write.stdout b/tests/expected/bins_static/unistd/write.stdout similarity index 100% rename from tests/expected/unistd/write.stdout rename to tests/expected/bins_static/unistd/write.stdout diff --git a/tests/expected/waitpid.stderr b/tests/expected/bins_static/waitpid.stderr similarity index 100% rename from tests/expected/waitpid.stderr rename to tests/expected/bins_static/waitpid.stderr diff --git a/tests/expected/waitpid.stdout b/tests/expected/bins_static/waitpid.stdout similarity index 100% rename from tests/expected/waitpid.stdout rename to tests/expected/bins_static/waitpid.stdout diff --git a/tests/expected/wchar/fwide.stderr b/tests/expected/bins_static/wchar/fwide.stderr similarity index 100% rename from tests/expected/wchar/fwide.stderr rename to tests/expected/bins_static/wchar/fwide.stderr diff --git a/tests/expected/wchar/fwide.stdout b/tests/expected/bins_static/wchar/fwide.stdout similarity index 100% rename from tests/expected/wchar/fwide.stdout rename to tests/expected/bins_static/wchar/fwide.stdout diff --git a/tests/expected/wchar/mbrtowc.stderr b/tests/expected/bins_static/wchar/mbrtowc.stderr similarity index 100% rename from tests/expected/wchar/mbrtowc.stderr rename to tests/expected/bins_static/wchar/mbrtowc.stderr diff --git a/tests/expected/wchar/mbrtowc.stdout b/tests/expected/bins_static/wchar/mbrtowc.stdout similarity index 100% rename from tests/expected/wchar/mbrtowc.stdout rename to tests/expected/bins_static/wchar/mbrtowc.stdout diff --git a/tests/expected/wchar/mbsrtowcs.stderr b/tests/expected/bins_static/wchar/mbsrtowcs.stderr similarity index 100% rename from tests/expected/wchar/mbsrtowcs.stderr rename to tests/expected/bins_static/wchar/mbsrtowcs.stderr diff --git a/tests/expected/wchar/mbsrtowcs.stdout b/tests/expected/bins_static/wchar/mbsrtowcs.stdout similarity index 100% rename from tests/expected/wchar/mbsrtowcs.stdout rename to tests/expected/bins_static/wchar/mbsrtowcs.stdout diff --git a/tests/expected/wchar/printf-on-wchars.stderr b/tests/expected/bins_static/wchar/printf-on-wchars.stderr similarity index 100% rename from tests/expected/wchar/printf-on-wchars.stderr rename to tests/expected/bins_static/wchar/printf-on-wchars.stderr diff --git a/tests/expected/wchar/printf-on-wchars.stdout b/tests/expected/bins_static/wchar/printf-on-wchars.stdout similarity index 100% rename from tests/expected/wchar/printf-on-wchars.stdout rename to tests/expected/bins_static/wchar/printf-on-wchars.stdout diff --git a/tests/expected/wchar/putwchar.stderr b/tests/expected/bins_static/wchar/putwchar.stderr similarity index 100% rename from tests/expected/wchar/putwchar.stderr rename to tests/expected/bins_static/wchar/putwchar.stderr diff --git a/tests/expected/wchar/putwchar.stdout b/tests/expected/bins_static/wchar/putwchar.stdout similarity index 100% rename from tests/expected/wchar/putwchar.stdout rename to tests/expected/bins_static/wchar/putwchar.stdout diff --git a/tests/expected/wchar/wcrtomb.stderr b/tests/expected/bins_static/wchar/wcrtomb.stderr similarity index 100% rename from tests/expected/wchar/wcrtomb.stderr rename to tests/expected/bins_static/wchar/wcrtomb.stderr diff --git a/tests/expected/wchar/wcrtomb.stdout b/tests/expected/bins_static/wchar/wcrtomb.stdout similarity index 100% rename from tests/expected/wchar/wcrtomb.stdout rename to tests/expected/bins_static/wchar/wcrtomb.stdout diff --git a/tests/expected/wchar/wcscasecmp.stderr b/tests/expected/bins_static/wchar/wcscasecmp.stderr similarity index 100% rename from tests/expected/wchar/wcscasecmp.stderr rename to tests/expected/bins_static/wchar/wcscasecmp.stderr diff --git a/tests/expected/wchar/wcscasecmp.stdout b/tests/expected/bins_static/wchar/wcscasecmp.stdout similarity index 100% rename from tests/expected/wchar/wcscasecmp.stdout rename to tests/expected/bins_static/wchar/wcscasecmp.stdout diff --git a/tests/expected/wchar/wcscspn.stderr b/tests/expected/bins_static/wchar/wcscspn.stderr similarity index 100% rename from tests/expected/wchar/wcscspn.stderr rename to tests/expected/bins_static/wchar/wcscspn.stderr diff --git a/tests/expected/wchar/wcscspn.stdout b/tests/expected/bins_static/wchar/wcscspn.stdout similarity index 100% rename from tests/expected/wchar/wcscspn.stdout rename to tests/expected/bins_static/wchar/wcscspn.stdout diff --git a/tests/expected/wchar/wcsncasecmp.stderr b/tests/expected/bins_static/wchar/wcsncasecmp.stderr similarity index 100% rename from tests/expected/wchar/wcsncasecmp.stderr rename to tests/expected/bins_static/wchar/wcsncasecmp.stderr diff --git a/tests/expected/wchar/wcsncasecmp.stdout b/tests/expected/bins_static/wchar/wcsncasecmp.stdout similarity index 100% rename from tests/expected/wchar/wcsncasecmp.stdout rename to tests/expected/bins_static/wchar/wcsncasecmp.stdout diff --git a/tests/expected/wchar/wcsrchr.stderr b/tests/expected/bins_static/wchar/wcsrchr.stderr similarity index 100% rename from tests/expected/wchar/wcsrchr.stderr rename to tests/expected/bins_static/wchar/wcsrchr.stderr diff --git a/tests/expected/wchar/wcsrchr.stdout b/tests/expected/bins_static/wchar/wcsrchr.stdout similarity index 100% rename from tests/expected/wchar/wcsrchr.stdout rename to tests/expected/bins_static/wchar/wcsrchr.stdout diff --git a/tests/expected/wchar/wcsstr.stderr b/tests/expected/bins_static/wchar/wcsstr.stderr similarity index 100% rename from tests/expected/wchar/wcsstr.stderr rename to tests/expected/bins_static/wchar/wcsstr.stderr diff --git a/tests/expected/wchar/wcsstr.stdout b/tests/expected/bins_static/wchar/wcsstr.stdout similarity index 100% rename from tests/expected/wchar/wcsstr.stdout rename to tests/expected/bins_static/wchar/wcsstr.stdout diff --git a/tests/expected/wchar/wcstod.stderr b/tests/expected/bins_static/wchar/wcstod.stderr similarity index 100% rename from tests/expected/wchar/wcstod.stderr rename to tests/expected/bins_static/wchar/wcstod.stderr diff --git a/tests/expected/wchar/wcstod.stdout b/tests/expected/bins_static/wchar/wcstod.stdout similarity index 100% rename from tests/expected/wchar/wcstod.stdout rename to tests/expected/bins_static/wchar/wcstod.stdout diff --git a/tests/expected/wchar/wcstok.stderr b/tests/expected/bins_static/wchar/wcstok.stderr similarity index 100% rename from tests/expected/wchar/wcstok.stderr rename to tests/expected/bins_static/wchar/wcstok.stderr diff --git a/tests/expected/wchar/wcstok.stdout b/tests/expected/bins_static/wchar/wcstok.stdout similarity index 100% rename from tests/expected/wchar/wcstok.stdout rename to tests/expected/bins_static/wchar/wcstok.stdout diff --git a/tests/expected/wchar/wcstol.stderr b/tests/expected/bins_static/wchar/wcstol.stderr similarity index 100% rename from tests/expected/wchar/wcstol.stderr rename to tests/expected/bins_static/wchar/wcstol.stderr diff --git a/tests/expected/wchar/wcstol.stdout b/tests/expected/bins_static/wchar/wcstol.stdout similarity index 100% rename from tests/expected/wchar/wcstol.stdout rename to tests/expected/bins_static/wchar/wcstol.stdout diff --git a/tests/expected/bins_dynamic/args.stderr b/tests/expected/bins_static/wchar/wcswidth.stderr similarity index 100% rename from tests/expected/bins_dynamic/args.stderr rename to tests/expected/bins_static/wchar/wcswidth.stderr diff --git a/tests/expected/bins_static/wchar/wcswidth.stdout b/tests/expected/bins_static/wchar/wcswidth.stdout new file mode 100644 index 0000000000..7da79364d8 --- /dev/null +++ b/tests/expected/bins_static/wchar/wcswidth.stdout @@ -0,0 +1 @@ +wcswidth(L"relibc", 6) = 6 diff --git a/tests/expected/wctype/towlower.stderr b/tests/expected/bins_static/wctype/towlower.stderr similarity index 100% rename from tests/expected/wctype/towlower.stderr rename to tests/expected/bins_static/wctype/towlower.stderr diff --git a/tests/expected/wctype/towlower.stdout b/tests/expected/bins_static/wctype/towlower.stdout similarity index 100% rename from tests/expected/wctype/towlower.stdout rename to tests/expected/bins_static/wctype/towlower.stdout diff --git a/tests/expected/wctype/towupper.stderr b/tests/expected/bins_static/wctype/towupper.stderr similarity index 100% rename from tests/expected/wctype/towupper.stderr rename to tests/expected/bins_static/wctype/towupper.stderr diff --git a/tests/expected/wctype/towupper.stdout b/tests/expected/bins_static/wctype/towupper.stdout similarity index 100% rename from tests/expected/wctype/towupper.stdout rename to tests/expected/bins_static/wctype/towupper.stdout diff --git a/tests/expected/dlfcn.stderr b/tests/expected/dlfcn.stderr deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/expected/dlfcn.stdout b/tests/expected/dlfcn.stdout deleted file mode 100644 index 5b51826bea..0000000000 --- a/tests/expected/dlfcn.stdout +++ /dev/null @@ -1,6 +0,0 @@ -add(22, 33) = 55 -puts from dlopened libc -sharedlib: global_var == 42 -sharedlib: tls_var == 21 -main: global_var == 42 -main: tls_var == 21 diff --git a/tests/expected/mkfifo.stderr b/tests/expected/mkfifo.stderr deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/expected/mkfifo.stdout b/tests/expected/mkfifo.stdout deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/expected/netdb/netdb.stderr b/tests/expected/netdb/netdb.stderr deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/expected/netdb/netdb.stdout b/tests/expected/netdb/netdb.stdout deleted file mode 100644 index 26a2f0f906..0000000000 --- a/tests/expected/netdb/netdb.stdout +++ /dev/null @@ -1 +0,0 @@ -No visible errors occurred! diff --git a/tests/wchar/wcswidth.c b/tests/wchar/wcswidth.c new file mode 100644 index 0000000000..79aeb921cb --- /dev/null +++ b/tests/wchar/wcswidth.c @@ -0,0 +1,10 @@ +#include +#include + +int main () { + wchar_t *wcs = L"relibc"; + size_t len = wcslen(wcs); + int width = wcswidth(wcs, len); + printf("wcswidth(L\"%ls\", %d) = %d\n", wcs, len, width); + return 0; +}