--- a/ChangeLog	Thu Aug 18 15:18:23 2016 +0200
+++ b/ChangeLog	Thu Aug 18 15:18:24 2016 +0200
@@ -1,3 +1,127 @@
+2016-08-18  Pino Toscano  <ptoscano@redhat.com>
+
+	Port tests away from progname, since modules that need the
+	program name already depend on getprogname.
+	* modules/acl-tests (Depends-on): Remove progname.
+	* modules/argmatch (Depends-on): Likewise.
+	* modules/argmatch-tests (Depends-on): Likewise.
+	* modules/argp-tests (Depends-on): Likewise.
+	* modules/argp-version-etc-tests (Depends-on): Likewise.
+	* modules/array-list-tests (Depends-on): Likewise.
+	* modules/array-oset-tests (Depends-on): Likewise.
+	* modules/avltree-list-tests (Depends-on): Likewise.
+	* modules/avltree-oset-tests (Depends-on): Likewise.
+	* modules/avltreehash-list-tests (Depends-on): Likewise.
+	* modules/carray-list-tests (Depends-on): Likewise.
+	* modules/copy-file-tests (Depends-on): Likewise.
+	* modules/exclude-tests (Depends-on): Likewise.
+	* modules/fchownat-tests (Depends-on): Likewise.
+	* modules/fdopendir-tests (Depends-on): Likewise.
+	* modules/filenamecat-tests (Depends-on): Likewise.
+	* modules/fstatat-tests (Depends-on): Likewise.
+	* modules/fstrcmp-tests (Depends-on): Likewise.
+	* modules/linked-list-tests (Depends-on): Likewise.
+	* modules/linkedhash-list-tests (Depends-on): Likewise.
+	* modules/mkdirat-tests (Depends-on): Likewise.
+	* modules/nonblocking-pipe-tests (Depends-on): Likewise.
+	* modules/nonblocking-socket-tests (Depends-on): Likewise.
+	* modules/obstack-printf-tests (Depends-on): Likewise.
+	* modules/openat-tests (Depends-on): Likewise.
+	* modules/parse-datetime-tests (Depends-on): Likewise.
+	* modules/pipe-filter-gi-tests (Depends-on): Likewise.
+	* modules/pipe-filter-ii-tests (Depends-on): Likewise.
+	* modules/quotearg-simple-tests (Depends-on): Likewise.
+	* modules/quotearg-tests (Depends-on): Likewise.
+	* modules/rbtree-list-tests (Depends-on): Likewise.
+	* modules/rbtree-oset-tests (Depends-on): Likewise.
+	* modules/rbtreehash-list-tests (Depends-on): Likewise.
+	* modules/spawn-pipe-tests (Depends-on): Likewise.
+	* modules/system-quote-tests (Depends-on): Likewise.
+	* modules/uniname/uniname-tests (Depends-on): Likewise.
+	* modules/uninorm/nfc-tests (Depends-on): Likewise.
+	* modules/uninorm/nfd-tests (Depends-on): Likewise.
+	* modules/uninorm/nfkc-tests (Depends-on): Likewise.
+	* modules/uninorm/nfkd-tests (Depends-on): Likewise.
+	* modules/unistdio/u16-vsnprintf-tests (Depends-on): Likewise.
+	* modules/unistdio/u16-vsprintf-tests (Depends-on): Likewise.
+	* modules/unistdio/u32-vsnprintf-tests (Depends-on): Likewise.
+	* modules/unistdio/u32-vsprintf-tests (Depends-on): Likewise.
+	* modules/unistdio/u8-vsnprintf-tests (Depends-on): Likewise.
+	* modules/unistdio/u8-vsprintf-tests (Depends-on): Likewise.
+	* modules/unistdio/ulc-vsnprintf-tests (Depends-on): Likewise.
+	* modules/unistdio/ulc-vsprintf-tests (Depends-on): Likewise.
+	* modules/unlinkat-tests (Depends-on): Likewise.
+	* modules/version-etc-tests (Depends-on): Likewise.
+	* modules/xalloc-die-tests (Depends-on): Likewise.
+	* modules/xmemdup0-tests (Depends-on): Likewise.
+	* modules/xprintf-posix-tests (Depends-on): Likewise.
+	* modules/xvasprintf-tests (Depends-on): Likewise.
+	* tests/test-argmatch.c: Do not include progname.h.
+	(main) Stop calling set_program_name.
+	* tests/test-argp-version-etc.c: Likewise.
+	* tests/test-argp.c: Likewise.
+	* tests/test-argv-iter.c: Likewise.
+	* tests/test-array_list.c: Likewise.
+	* tests/test-array_oset.c: Likewise.
+	* tests/test-avltree_list.c: Likewise.
+	* tests/test-avltree_oset.c: Likewise.
+	* tests/test-avltreehash_list.c: Likewise.
+	* tests/test-carray_list.c: Likewise.
+	* tests/test-copy-acl.c: Likewise.
+	* tests/test-copy-file.c: Likewise.
+	* tests/test-exclude.c: Likewise.
+	* tests/test-fchownat.c: Likewise.
+	* tests/test-fdopendir.c: Likewise.
+	* tests/test-filenamecat.c: Likewise.
+	* tests/test-fstatat.c: Likewise.
+	* tests/test-fstrcmp.c: Likewise.
+	* tests/test-linked_list.c: Likewise.
+	* tests/test-linkedhash_list.c: Likewise.
+	* tests/test-mkdirat.c: Likewise.
+	* tests/test-nonblocking-pipe-main.c: Likewise.
+	* tests/test-nonblocking-socket-main.c: Likewise.
+	* tests/test-obstack-printf.c: Likewise.
+	* tests/test-openat.c: Likewise.
+	* tests/test-parse-datetime.c: Likewise.
+	* tests/test-pipe-filter-gi1.c: Likewise.
+	* tests/test-pipe-filter-gi2-main.c: Likewise.
+	* tests/test-pipe-filter-ii1.c: Likewise.
+	* tests/test-pipe-filter-ii2-main.c: Likewise.
+	* tests/test-quotearg-simple.c: Likewise.
+	* tests/test-quotearg.c: Likewise.
+	* tests/test-rbtree_list.c: Likewise.
+	* tests/test-rbtree_oset.c: Likewise.
+	* tests/test-rbtreehash_list.c: Likewise.
+	* tests/test-sameacls.c: Likewise.
+	* tests/test-set-mode-acl.c: Likewise.
+	* tests/test-spawn-pipe-main.c: Likewise.
+	* tests/test-system-quote-main.c: Likewise.
+	* tests/test-unlinkat.c: Likewise.
+	* tests/test-version-etc.c: Likewise.
+	* tests/test-xalloc-die.c: Likewise.
+	* tests/test-xfprintf-posix.c: Likewise.
+	* tests/test-xmemdup0.c: Likewise.
+	* tests/test-xprintf-posix.c: Likewise.
+	* tests/test-xvasprintf.c: Likewise.
+	* tests/uniname/test-uninames.c: Likewise.
+	* tests/uninorm/test-u32-nfc-big.c: Likewise.
+	* tests/uninorm/test-u32-nfd-big.c: Likewise.
+	* tests/uninorm/test-u32-nfkc-big.c: Likewise.
+	* tests/uninorm/test-u32-nfkd-big.c: Likewise.
+	* tests/unistdio/test-u16-vsnprintf1.c: Likewise.
+	* tests/unistdio/test-u16-vsprintf1.c: Likewise.
+	* tests/unistdio/test-u32-vsnprintf1.c: Likewise.
+	* tests/unistdio/test-u32-vsprintf1.c: Likewise.
+	* tests/unistdio/test-u8-vsnprintf1.c: Likewise.
+	* tests/unistdio/test-u8-vsprintf1.c: Likewise.
+	* tests/unistdio/test-ulc-vsnprintf1.c: Likewise.
+	* tests/unistdio/test-ulc-vsprintf1.c: Likewise.
+	* tests/test-c-stack.c: (program_name): Do not define.
+	(main): Do not set program_name.
+	* tests/test-closein.c: Likewise.
+	* tests/test-xstrtol.c: Likewise.
+	* tests/test-yesno.c: Likewise.
+
 2016-08-18  Pino Toscano  <ptoscano@redhat.com>
 
 	Port modules to use getprogname explicitly, instead of requiring

--- a/modules/acl-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/acl-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -12,7 +12,6 @@
 
 Depends-on:
 file-has-acl-tests
-progname
 read-file
 unistd
 xalloc

--- a/modules/argmatch-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/argmatch-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -3,7 +3,6 @@
 tests/macros.h
 
 Depends-on:
-progname
 
 configure.ac:
 

--- a/modules/argp-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/argp-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -3,7 +3,6 @@
 tests/test-argp-2.sh
 
 Depends-on:
-progname
 
 Makefile.am:
 TESTS += test-argp test-argp-2.sh

--- a/modules/argp-version-etc-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/argp-version-etc-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -4,7 +4,6 @@
 
 Depends-on:
 argp
-progname
 version-etc-fsf
 
 Makefile.am:

--- a/modules/array-list-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/array-list-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -3,7 +3,6 @@
 tests/macros.h
 
 Depends-on:
-progname
 
 configure.ac:
 

--- a/modules/array-oset-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/array-oset-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -5,7 +5,6 @@
 Depends-on:
 xlist
 array-list
-progname
 
 configure.ac:
 

--- a/modules/avltree-list-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/avltree-list-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -4,7 +4,6 @@
 
 Depends-on:
 array-list
-progname
 
 configure.ac:
 

--- a/modules/avltree-oset-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/avltree-oset-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -4,7 +4,6 @@
 
 Depends-on:
 array-oset
-progname
 
 configure.ac:
 

--- a/modules/avltreehash-list-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/avltreehash-list-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -4,7 +4,6 @@
 
 Depends-on:
 array-list
-progname
 
 configure.ac:
 

--- a/modules/carray-list-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/carray-list-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -4,7 +4,6 @@
 
 Depends-on:
 array-list
-progname
 
 configure.ac:
 

--- a/modules/copy-file-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/copy-file-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -8,7 +8,6 @@
 Depends-on:
 acl
 acl-tests
-progname
 read-file
 xalloc
 

--- a/modules/exclude-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/exclude-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -12,7 +12,6 @@
 Depends-on:
 argmatch
 error
-progname
 test-framework-sh
 
 Makefile.am:

--- a/modules/fchownat-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/fchownat-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -11,7 +11,6 @@
 mgetgroups
 nanosleep
 openat-h
-progname
 stat-time
 symlink
 

--- a/modules/fdopendir-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/fdopendir-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -7,7 +7,6 @@
 open
 opendir
 closedir
-progname
 
 configure.ac:
 

--- a/modules/filenamecat-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/filenamecat-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -3,7 +3,6 @@
 
 Depends-on:
 stdbool
-progname
 
 configure.ac:
 

--- a/modules/fstatat-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/fstatat-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -9,7 +9,6 @@
 getcwd-lgpl
 ignore-value
 openat-h
-progname
 symlink
 
 configure.ac:

--- a/modules/fstrcmp-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/fstrcmp-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -4,7 +4,6 @@
 
 Depends-on:
 stdbool
-progname
 
 configure.ac:
 

--- a/modules/linked-list-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/linked-list-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -4,7 +4,6 @@
 
 Depends-on:
 array-list
-progname
 
 configure.ac:
 

--- a/modules/linkedhash-list-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/linkedhash-list-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -4,7 +4,6 @@
 
 Depends-on:
 array-list
-progname
 
 configure.ac:
 

--- a/modules/mkdirat-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/mkdirat-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -6,7 +6,6 @@
 
 Depends-on:
 ignore-value
-progname
 symlink
 
 configure.ac:

--- a/modules/nonblocking-pipe-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/nonblocking-pipe-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -13,7 +13,6 @@
 unistd
 nonblocking
 wait-process
-progname
 pipe-posix
 dup2
 environ

--- a/modules/nonblocking-socket-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/nonblocking-socket-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -16,7 +16,6 @@
 sys_socket
 nonblocking
 wait-process
-progname
 environ
 posix_spawnp
 netinet_in

--- a/modules/obstack-printf-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/obstack-printf-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -4,7 +4,6 @@
 tests/macros.h
 
 Depends-on:
-progname
 xalloc
 
 configure.ac:

--- a/modules/openat-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/openat-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -5,7 +5,6 @@
 tests/macros.h
 
 Depends-on:
-progname
 symlink
 
 configure.ac:

--- a/modules/parse-datetime-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/parse-datetime-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -3,7 +3,6 @@
 tests/macros.h
 
 Depends-on:
-progname
 setenv
 
 configure.ac:

--- a/modules/pipe-filter-gi-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/pipe-filter-gi-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -13,7 +13,6 @@
 read-file
 full-write
 usleep
-progname
 
 configure.ac:
 

--- a/modules/pipe-filter-ii-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/pipe-filter-ii-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -12,7 +12,6 @@
 c-ctype
 read-file
 full-write
-progname
 
 configure.ac:
 

--- a/modules/quotearg-simple-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/quotearg-simple-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -6,7 +6,6 @@
 m4/mmap-anon.m4
 
 Depends-on:
-progname
 stdint
 
 configure.ac:

--- a/modules/quotearg-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/quotearg-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -13,7 +13,6 @@
 
 Depends-on:
 gettext
-progname
 stdint
 setenv
 unsetenv

--- a/modules/rbtree-list-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/rbtree-list-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -4,7 +4,6 @@
 
 Depends-on:
 array-list
-progname
 
 configure.ac:
 

--- a/modules/rbtree-oset-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/rbtree-oset-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -4,7 +4,6 @@
 
 Depends-on:
 array-oset
-progname
 
 configure.ac:
 

--- a/modules/rbtreehash-list-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/rbtreehash-list-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -4,7 +4,6 @@
 
 Depends-on:
 array-list
-progname
 
 configure.ac:
 

--- a/modules/spawn-pipe-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/spawn-pipe-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -6,7 +6,6 @@
 
 Depends-on:
 close
-progname
 
 configure.ac:
 

--- a/modules/system-quote-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/system-quote-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -10,7 +10,6 @@
 Depends-on:
 stdbool
 unistd
-progname
 popen
 pclose
 

--- a/modules/uniname/uniname-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/uniname/uniname-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -7,7 +7,6 @@
 
 Depends-on:
 xalloc
-progname
 
 configure.ac:
 

--- a/modules/uninorm/nfc-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/uninorm/nfc-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -16,7 +16,6 @@
 unistr/u32-cmp
 unistr/u32-strlen
 xalloc
-progname
 
 configure.ac:
 AC_CHECK_DECLS_ONCE([alarm])

--- a/modules/uninorm/nfd-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/uninorm/nfd-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -16,7 +16,6 @@
 unistr/u32-cmp
 unistr/u32-strlen
 xalloc
-progname
 
 configure.ac:
 AC_CHECK_DECLS_ONCE([alarm])

--- a/modules/uninorm/nfkc-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/uninorm/nfkc-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -16,7 +16,6 @@
 unistr/u32-cmp
 unistr/u32-strlen
 xalloc
-progname
 
 configure.ac:
 AC_CHECK_DECLS_ONCE([alarm])

--- a/modules/uninorm/nfkd-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/uninorm/nfkd-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -16,7 +16,6 @@
 unistr/u32-cmp
 unistr/u32-strlen
 xalloc
-progname
 
 configure.ac:
 AC_CHECK_DECLS_ONCE([alarm])

--- a/modules/unistdio/u16-vsnprintf-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/unistdio/u16-vsnprintf-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -5,7 +5,6 @@
 
 Depends-on:
 xalloc
-progname
 
 configure.ac:
 

--- a/modules/unistdio/u16-vsprintf-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/unistdio/u16-vsprintf-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -5,7 +5,6 @@
 
 Depends-on:
 xalloc
-progname
 
 configure.ac:
 

--- a/modules/unistdio/u32-vsnprintf-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/unistdio/u32-vsnprintf-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -5,7 +5,6 @@
 
 Depends-on:
 xalloc
-progname
 
 configure.ac:
 

--- a/modules/unistdio/u32-vsprintf-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/unistdio/u32-vsprintf-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -5,7 +5,6 @@
 
 Depends-on:
 xalloc
-progname
 
 configure.ac:
 

--- a/modules/unistdio/u8-vsnprintf-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/unistdio/u8-vsnprintf-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -5,7 +5,6 @@
 
 Depends-on:
 xalloc
-progname
 
 configure.ac:
 

--- a/modules/unistdio/u8-vsprintf-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/unistdio/u8-vsprintf-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -5,7 +5,6 @@
 
 Depends-on:
 xalloc
-progname
 
 configure.ac:
 

--- a/modules/unistdio/ulc-vsnprintf-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/unistdio/ulc-vsnprintf-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -5,7 +5,6 @@
 
 Depends-on:
 xalloc
-progname
 
 configure.ac:
 

--- a/modules/unistdio/ulc-vsprintf-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/unistdio/ulc-vsprintf-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -5,7 +5,6 @@
 
 Depends-on:
 xalloc
-progname
 
 configure.ac:
 

--- a/modules/unlinkat-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/unlinkat-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -7,7 +7,6 @@
 
 Depends-on:
 ignore-value
-progname
 symlink
 unlinkdir
 

--- a/modules/version-etc-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/version-etc-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -3,7 +3,6 @@
 tests/test-version-etc.sh
 
 Depends-on:
-progname
 version-etc-fsf
 
 Makefile.am:

--- a/modules/xalloc-die-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/xalloc-die-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -3,7 +3,6 @@
 tests/test-xalloc-die.sh
 
 Depends-on:
-progname
 test-framework-sh
 
 Makefile.am:

--- a/modules/xmemdup0-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/xmemdup0-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -3,7 +3,6 @@
 tests/macros.h
 
 Depends-on:
-progname
 
 configure.ac:
 

--- a/modules/xprintf-posix-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/xprintf-posix-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -10,7 +10,6 @@
 
 Depends-on:
 stdint
-progname
 
 configure.ac:
 

--- a/modules/xvasprintf-tests	Thu Aug 18 15:18:23 2016 +0200
+++ b/modules/xvasprintf-tests	Thu Aug 18 15:18:24 2016 +0200
@@ -3,7 +3,6 @@
 tests/macros.h
 
 Depends-on:
-progname
 
 configure.ac:
 

--- a/tests/test-argmatch.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-argmatch.c	Thu Aug 18 15:18:24 2016 +0200
@@ -23,7 +23,6 @@
 
 #include <stdlib.h>
 
-#include "progname.h"
 #include "macros.h"
 
 /* Some packages define ARGMATCH_DIE and ARGMATCH_DIE_DECL in <config.h>, and
@@ -63,8 +62,6 @@
 int
 main (int argc, char *argv[])
 {
-  set_program_name (argv[0]);
-
   /* Not found.  */
   ASSERT (ARGMATCH ("klingon", backup_args, backup_vals) == -1);
 

--- a/tests/test-argp-version-etc.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-argp-version-etc.c	Thu Aug 18 15:18:24 2016 +0200
@@ -18,7 +18,6 @@
 #include <config.h>
 #include "argp-version-etc.h"
 #include "argp.h"
-#include "progname.h"
 
 static char doc[] = "test for the argp-version-etc module";
 
@@ -42,7 +41,6 @@
 int
 main (int argc, char **argv)
 {
-  set_program_name (argv[0]);
   argp_version_setup ("test-argp-version-etc", authors);
   return argp_parse (&test_argp, argc, argv, 0, NULL, NULL);
 }

--- a/tests/test-argp.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-argp.c	Thu Aug 18 15:18:24 2016 +0200
@@ -25,7 +25,6 @@
 #if HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#include "progname.h"
 
 struct test_args
 {
@@ -459,8 +458,6 @@
   struct argp_child argp_children[3], group1_children[2], group2_children[2];
   test_fp *fun;
 
-  set_program_name (argv[0]);
-
   group1_children[0] = group1_1_child;
   group1_children[1].argp = NULL;
   group1_argp.children = group1_children;

--- a/tests/test-argv-iter.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-argv-iter.c	Thu Aug 18 15:18:24 2016 +0200
@@ -47,7 +47,6 @@
 int
 main (void)
 {
-  /* set_program_name (argv[0]); placate overzealous "syntax-check" test.  */
   static char one[] = "1";
   static char two[] = "2";
   static char three[] = "3";

--- a/tests/test-array_list.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-array_list.c	Thu Aug 18 15:18:24 2016 +0200
@@ -21,7 +21,6 @@
 
 #include <stdlib.h>
 
-#include "progname.h"
 #include "macros.h"
 
 static const char *objects[15] =
@@ -50,8 +49,6 @@
 {
   gl_list_t list1, list2;
 
-  set_program_name (argv[0]);
-
   /* Allow the user to provide a non-default random seed on the command line.  */
   if (argc > 1)
     srand (atoi (argv[1]));

--- a/tests/test-array_oset.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-array_oset.c	Thu Aug 18 15:18:24 2016 +0200
@@ -24,7 +24,6 @@
 
 #include "gl_xlist.h"
 #include "gl_array_list.h"
-#include "progname.h"
 #include "macros.h"
 
 static const char *objects[30] =
@@ -73,8 +72,6 @@
   gl_oset_t set1;
   gl_list_t set2;
 
-  set_program_name (argv[0]);
-
   /* Allow the user to provide a non-default random seed on the command line.  */
   if (argc > 1)
     srand (atoi (argv[1]));

--- a/tests/test-avltree_list.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-avltree_list.c	Thu Aug 18 15:18:24 2016 +0200
@@ -22,7 +22,6 @@
 #include <stdlib.h>
 
 #include "gl_array_list.h"
-#include "progname.h"
 #include "macros.h"
 
 extern void gl_avltree_list_check_invariants (gl_list_t list);
@@ -62,8 +61,6 @@
 {
   gl_list_t list1, list2, list3;
 
-  set_program_name (argv[0]);
-
   /* Allow the user to provide a non-default random seed on the command line.  */
   if (argc > 1)
     srand (atoi (argv[1]));

--- a/tests/test-avltree_oset.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-avltree_oset.c	Thu Aug 18 15:18:24 2016 +0200
@@ -23,7 +23,6 @@
 #include <string.h>
 
 #include "gl_array_oset.h"
-#include "progname.h"
 #include "macros.h"
 
 extern void gl_avltree_oset_check_invariants (gl_oset_t set);
@@ -72,8 +71,6 @@
 {
   gl_oset_t set1, set2;
 
-  set_program_name (argv[0]);
-
   /* Allow the user to provide a non-default random seed on the command line.  */
   if (argc > 1)
     srand (atoi (argv[1]));

--- a/tests/test-avltreehash_list.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-avltreehash_list.c	Thu Aug 18 15:18:24 2016 +0200
@@ -24,7 +24,6 @@
 #include <string.h>
 
 #include "gl_array_list.h"
-#include "progname.h"
 #include "macros.h"
 
 extern void gl_avltreehash_list_check_invariants (gl_list_t list);
@@ -89,8 +88,6 @@
 {
   gl_list_t list1, list2, list3;
 
-  set_program_name (argv[0]);
-
   /* Allow the user to provide a non-default random seed on the command line.  */
   if (argc > 1)
     srand (atoi (argv[1]));

--- a/tests/test-c-stack.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-c-stack.c	Thu Aug 18 15:18:24 2016 +0200
@@ -30,8 +30,6 @@
 
 #include "macros.h"
 
-char *program_name;
-
 static volatile int *
 recurse_1 (volatile int n, volatile int *p)
 {
@@ -60,7 +58,6 @@
   setrlimit (RLIMIT_STACK, &rl);
 #endif
 
-  program_name = argv[0];
   if (c_stack_action (NULL) == 0)
     {
       if (1 < argc)

--- a/tests/test-carray_list.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-carray_list.c	Thu Aug 18 15:18:24 2016 +0200
@@ -22,7 +22,6 @@
 #include <stdlib.h>
 
 #include "gl_array_list.h"
-#include "progname.h"
 #include "macros.h"
 
 static const char *objects[15] =
@@ -58,8 +57,6 @@
 {
   gl_list_t list1, list2, list3;
 
-  set_program_name (argv[0]);
-
   /* Allow the user to provide a non-default random seed on the command line.  */
   if (argc > 1)
     srand (atoi (argv[1]));

--- a/tests/test-closein.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-closein.c	Thu Aug 18 15:18:24 2016 +0200
@@ -27,8 +27,6 @@
 #include "binary-io.h"
 #include "ignore-value.h"
 
-char *program_name;
-
 /* With no arguments, do nothing.  With arguments, attempt to consume
    first 6 bytes of stdin.  In either case, let exit() take care of
    closing std streams and changing exit status if ferror(stdin).  */
@@ -37,7 +35,6 @@
 {
   char buf[7];
   atexit (close_stdin);
-  program_name = argv[0];
 
   /* close_stdin currently relies on ftell, but mingw ftell is
      unreliable on text mode input.  */

--- a/tests/test-copy-acl.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-copy-acl.c	Thu Aug 18 15:18:24 2016 +0200
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "progname.h"
 #include "macros.h"
 
 int
@@ -40,8 +39,6 @@
   int mode;
   int fd2;
 
-  set_program_name (argv[0]);
-
   ASSERT (argc == 3);
 
   file1 = argv[1];

--- a/tests/test-copy-file.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-copy-file.c	Thu Aug 18 15:18:24 2016 +0200
@@ -22,7 +22,6 @@
 
 #include <stdlib.h>
 
-#include "progname.h"
 #include "macros.h"
 
 int
@@ -32,8 +31,6 @@
   const char *file2;
   int null_stderr;
 
-  set_program_name (argv[0]);
-
   ASSERT (argc == 3);
 
   file1 = argv[1];

--- a/tests/test-exclude.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-exclude.c	Thu Aug 18 15:18:24 2016 +0200
@@ -24,7 +24,6 @@
 #include <fnmatch.h>
 
 #include "exclude.h"
-#include "progname.h"
 #include "error.h"
 #include "argmatch.h"
 
@@ -75,8 +74,6 @@
   int exclude_options = 0;
   struct exclude *exclude = new_exclude ();
 
-  set_program_name (argv[0]);
-
   if (argc == 1)
     error (1, 0, "usage: %s file -- words...", argv[0]);
 

--- a/tests/test-fchownat.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-fchownat.c	Thu Aug 18 15:18:24 2016 +0200
@@ -32,7 +32,6 @@
 
 #include "mgetgroups.h"
 #include "openat.h"
-#include "progname.h"
 #include "stat-time.h"
 #include "ignore-value.h"
 #include "macros.h"
@@ -64,8 +63,6 @@
   int result1; /* Skip because of no chown/symlink support.  */
   int result2; /* Skip because of no lchown support.  */
 
-  set_program_name (argv[0]);
-
   /* Clean up any trash from prior testsuite runs.  */
   ignore_value (system ("rm -rf " BASE "*"));
 

--- a/tests/test-fdopendir.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-fdopendir.c	Thu Aug 18 15:18:24 2016 +0200
@@ -27,7 +27,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "progname.h"
 #include "macros.h"
 
 int
@@ -36,8 +35,6 @@
   DIR *d;
   int fd;
 
-  set_program_name (argv[0]);
-
   /* A non-directory cannot be turned into a directory stream.  */
   fd = open ("test-fdopendir.tmp", O_RDONLY | O_CREAT, 0600);
   ASSERT (0 <= fd);

--- a/tests/test-filenamecat.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-filenamecat.c	Thu Aug 18 15:18:24 2016 +0200
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "progname.h"
 
 int
 main (int argc _GL_UNUSED, char *argv[])
@@ -49,8 +48,6 @@
   unsigned int i;
   bool fail = false;
 
-  set_program_name (argv[0]);
-
   for (i = 0; i < sizeof tests / sizeof tests[0]; i++)
     {
       char *base_in_result;

--- a/tests/test-fstatat.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-fstatat.c	Thu Aug 18 15:18:24 2016 +0200
@@ -31,7 +31,6 @@
 #include <unistd.h>
 
 #include "openat.h"
-#include "progname.h"
 #include "same-inode.h"
 #include "ignore-value.h"
 #include "macros.h"
@@ -72,8 +71,6 @@
 {
   int result;
 
-  set_program_name (argv[0]);
-
   /* Remove any leftovers from a previous partial run.  */
   ignore_value (system ("rm -rf " BASE "*"));
 

--- a/tests/test-fstrcmp.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-fstrcmp.c	Thu Aug 18 15:18:24 2016 +0200
@@ -22,7 +22,6 @@
 
 #include <stdbool.h>
 
-#include "progname.h"
 #include "macros.h"
 
 static bool
@@ -66,8 +65,6 @@
 int
 main (int argc, char *argv[])
 {
-  set_program_name (argv[0]);
-
   ASSERT (check_fstrcmp ("Langstrumpf", "Langstrumpf", 1.0));
   ASSERT (check_fstrcmp ("Levenshtein", "Levenstein", 20./21.));
   ASSERT (check_fstrcmp ("Levenstein", "Levenshtein", 20./21.));

--- a/tests/test-linked_list.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-linked_list.c	Thu Aug 18 15:18:24 2016 +0200
@@ -22,7 +22,6 @@
 #include <stdlib.h>
 
 #include "gl_array_list.h"
-#include "progname.h"
 #include "macros.h"
 
 static const char *objects[15] =
@@ -58,8 +57,6 @@
 {
   gl_list_t list1, list2, list3;
 
-  set_program_name (argv[0]);
-
   /* Allow the user to provide a non-default random seed on the command line.  */
   if (argc > 1)
     srand (atoi (argv[1]));

--- a/tests/test-linkedhash_list.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-linkedhash_list.c	Thu Aug 18 15:18:24 2016 +0200
@@ -24,7 +24,6 @@
 #include <string.h>
 
 #include "gl_array_list.h"
-#include "progname.h"
 #include "macros.h"
 
 static const char *objects[15] =
@@ -85,8 +84,6 @@
 {
   gl_list_t list1, list2, list3;
 
-  set_program_name (argv[0]);
-
   /* Allow the user to provide a non-default random seed on the command line.  */
   if (argc > 1)
     srand (atoi (argv[1]));

--- a/tests/test-mkdirat.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-mkdirat.c	Thu Aug 18 15:18:24 2016 +0200
@@ -30,7 +30,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "progname.h"
 #include "ignore-value.h"
 #include "macros.h"
 
@@ -52,8 +51,6 @@
 {
   int result;
 
-  set_program_name (argv[0]);
-
   /* Clean up any trash from prior testsuite runs.  */
   ignore_value (system ("rm -rf " BASE "*"));
 

--- a/tests/test-nonblocking-pipe-main.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-nonblocking-pipe-main.c	Thu Aug 18 15:18:24 2016 +0200
@@ -32,7 +32,6 @@
 
 #include "nonblocking.h"
 #include "wait-process.h"
-#include "progname.h"
 
 #include "macros.h"
 #include "test-nonblocking-pipe.h"
@@ -48,8 +47,6 @@
   int child;
   int exitcode;
 
-  set_program_name (argv[0]);
-
   child_path = argv[1];
   test = atoi (argv[2]);
 

--- a/tests/test-nonblocking-socket-main.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-nonblocking-socket-main.c	Thu Aug 18 15:18:24 2016 +0200
@@ -33,7 +33,6 @@
 
 #include "nonblocking.h"
 #include "wait-process.h"
-#include "progname.h"
 
 #include "macros.h"
 #include "socket-server.h"
@@ -52,8 +51,6 @@
   int server_socket;
   int exitcode;
 
-  set_program_name (argv[0]);
-
   child_path = argv[1];
   test = atoi (argv[2]);
 

--- a/tests/test-obstack-printf.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-obstack-printf.c	Thu Aug 18 15:18:24 2016 +0200
@@ -32,7 +32,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "progname.h"
 #include "macros.h"
 
 #define obstack_chunk_alloc xmalloc
@@ -130,8 +129,6 @@
 int
 main (int argc, char *argv[])
 {
-  set_program_name (argv[0]);
-
   test_obstack_vprintf ();
   test_obstack_printf ();
   return 0;

--- a/tests/test-openat.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-openat.c	Thu Aug 18 15:18:24 2016 +0200
@@ -29,7 +29,6 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include "progname.h"
 #include "macros.h"
 
 #define BASE "test-openat.t"
@@ -63,8 +62,6 @@
 {
   int result;
 
-  set_program_name (argv[0]);
-
   /* Test behaviour for invalid file descriptors.  */
   {
     errno = 0;

--- a/tests/test-parse-datetime.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-parse-datetime.c	Thu Aug 18 15:18:24 2016 +0200
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "progname.h"
 #include "macros.h"
 
 #ifdef DEBUG
@@ -121,8 +120,6 @@
   long gmtoff;
   time_t ref_time = 1304250918;
 
-  set_program_name (argv[0]);
-
   /* Set the time zone to US Eastern time with the 2012 rules.  This
      should disable any leap second support.  Otherwise, there will be
      a problem with glibc on sites that default to leap seconds; see

--- a/tests/test-pipe-filter-gi1.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-pipe-filter-gi1.c	Thu Aug 18 15:18:24 2016 +0200
@@ -22,7 +22,6 @@
 #include "binary-io.h"
 #include "c-ctype.h"
 #include "read-file.h"
-#include "progname.h"
 #include "macros.h"
 
 
@@ -75,8 +74,6 @@
   size_t input_size;
   char *input;
 
-  set_program_name (argv[0]);
-
   ASSERT (argc == 3);
 
   tr_program = argv[1];

--- a/tests/test-pipe-filter-gi2-main.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-pipe-filter-gi2-main.c	Thu Aug 18 15:18:24 2016 +0200
@@ -27,7 +27,6 @@
 #include <signal.h>
 
 #include "full-write.h"
-#include "progname.h"
 #include "macros.h"
 
 /* 0.1 sec pause */
@@ -73,8 +72,6 @@
   struct pipe_filter_gi *f;
   const char *path[] = { NULL, NULL };
 
-  set_program_name (argv[0]);
-
   ASSERT (argc == 2);
 
   /* Test writing to a nonexistent program traps sooner or later.  */

--- a/tests/test-pipe-filter-ii1.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-pipe-filter-ii1.c	Thu Aug 18 15:18:24 2016 +0200
@@ -22,7 +22,6 @@
 #include "binary-io.h"
 #include "c-ctype.h"
 #include "read-file.h"
-#include "progname.h"
 #include "macros.h"
 
 
@@ -97,8 +96,6 @@
   size_t input_size;
   char *input;
 
-  set_program_name (argv[0]);
-
   ASSERT (argc == 3);
 
   tr_program = argv[1];

--- a/tests/test-pipe-filter-ii2-main.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-pipe-filter-ii2-main.c	Thu Aug 18 15:18:24 2016 +0200
@@ -27,7 +27,6 @@
 #include <signal.h>
 
 #include "full-write.h"
-#include "progname.h"
 #include "macros.h"
 
 struct locals
@@ -87,8 +86,6 @@
 {
   const char *path[] = { NULL, NULL };
 
-  set_program_name (argv[0]);
-
   ASSERT (argc == 2);
 
   /* Test writing to a nonexistent program traps sooner or later.  */

--- a/tests/test-quotearg-simple.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-quotearg-simple.c	Thu Aug 18 15:18:24 2016 +0200
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include "localcharset.h"
-#include "progname.h"
 #include "macros.h"
 #include "zerosize-ptr.h"
 
@@ -251,8 +250,6 @@
   int i;
   bool ascii_only = MB_CUR_MAX == 1 && !isprint ((unsigned char) LQ[0]);
 
-  set_program_name (argv[0]);
-
   /* This part of the program is hard-wired to the C locale since it
      does not call setlocale.  However, according to POSIX, the use of
      8-bit bytes in a character context in the C locale gives

--- a/tests/test-quotearg.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-quotearg.c	Thu Aug 18 15:18:24 2016 +0200
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "progname.h"
 #include "gettext.h"
 #include "macros.h"
 
@@ -63,8 +62,6 @@
 int
 main (int argc _GL_UNUSED, char *argv[])
 {
-  set_program_name (argv[0]);
-
 #if ENABLE_NLS
   /* Clean up environment.  */
   unsetenv ("LANGUAGE");

--- a/tests/test-rbtree_list.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-rbtree_list.c	Thu Aug 18 15:18:24 2016 +0200
@@ -22,7 +22,6 @@
 #include <stdlib.h>
 
 #include "gl_array_list.h"
-#include "progname.h"
 #include "macros.h"
 
 extern void gl_rbtree_list_check_invariants (gl_list_t list);
@@ -62,8 +61,6 @@
 {
   gl_list_t list1, list2, list3;
 
-  set_program_name (argv[0]);
-
   /* Allow the user to provide a non-default random seed on the command line.  */
   if (argc > 1)
     srand (atoi (argv[1]));

--- a/tests/test-rbtree_oset.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-rbtree_oset.c	Thu Aug 18 15:18:24 2016 +0200
@@ -23,7 +23,6 @@
 #include <string.h>
 
 #include "gl_array_oset.h"
-#include "progname.h"
 #include "macros.h"
 
 extern void gl_rbtree_oset_check_invariants (gl_oset_t set);
@@ -72,8 +71,6 @@
 {
   gl_oset_t set1, set2;
 
-  set_program_name (argv[0]);
-
   /* Allow the user to provide a non-default random seed on the command line.  */
   if (argc > 1)
     srand (atoi (argv[1]));

--- a/tests/test-rbtreehash_list.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-rbtreehash_list.c	Thu Aug 18 15:18:24 2016 +0200
@@ -24,7 +24,6 @@
 #include <string.h>
 
 #include "gl_array_list.h"
-#include "progname.h"
 #include "macros.h"
 
 extern void gl_rbtreehash_list_check_invariants (gl_list_t list);
@@ -89,8 +88,6 @@
 {
   gl_list_t list1, list2, list3;
 
-  set_program_name (argv[0]);
-
   /* Allow the user to provide a non-default random seed on the command line.  */
   if (argc > 1)
     srand (atoi (argv[1]));

--- a/tests/test-sameacls.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-sameacls.c	Thu Aug 18 15:18:24 2016 +0200
@@ -33,7 +33,6 @@
 # include <aclv.h>
 #endif
 
-#include "progname.h"
 #include "read-file.h"
 #include "xalloc.h"
 #include "macros.h"
@@ -44,8 +43,6 @@
   const char *file1;
   const char *file2;
 
-  set_program_name (argv[0]);
-
   ASSERT (argc == 3);
 
   file1 = argv[1];

--- a/tests/test-set-mode-acl.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-set-mode-acl.c	Thu Aug 18 15:18:24 2016 +0200
@@ -22,7 +22,6 @@
 
 #include <stdlib.h>
 
-#include "progname.h"
 #include "macros.h"
 
 int
@@ -31,8 +30,6 @@
   const char *file;
   int mode;
 
-  set_program_name (argv[0]);
-
   ASSERT (argc == 3);
 
   file = argv[1];

--- a/tests/test-spawn-pipe-main.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-spawn-pipe-main.c	Thu Aug 18 15:18:24 2016 +0200
@@ -18,7 +18,6 @@
 
 #include "spawn-pipe.h"
 #include "wait-process.h"
-#include "progname.h"
 
 #include <stdbool.h>
 #include <stdio.h>
@@ -80,8 +79,6 @@
   int test;
   int fd;
 
-  set_program_name (argv[0]);
-
   if (argc != 3)
     {
       fprintf (stderr, "%s: need 2 arguments\n", argv[0]);

--- a/tests/test-system-quote-main.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-system-quote-main.c	Thu Aug 18 15:18:24 2016 +0200
@@ -36,7 +36,6 @@
 # include <windows.h>
 #endif
 
-#include "progname.h"
 #include "macros.h"
 
 #define EXPECTED_DATA_FILE "t-sq-data.tmp"
@@ -318,8 +317,6 @@
 {
   char *prog;
 
-  set_program_name (argv[0]);
-
   if (argc != 2)
     {
       fprintf (stderr, "%s: need 1 argument\n", argv[0]);

--- a/tests/test-unlinkat.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-unlinkat.c	Thu Aug 18 15:18:24 2016 +0200
@@ -30,7 +30,6 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
-#include "progname.h"
 #include "unlinkdir.h"
 #include "ignore-value.h"
 #include "macros.h"
@@ -63,8 +62,6 @@
   int result1;
   int result2;
 
-  set_program_name (argv[0]);
-
   /* Remove any leftovers from a previous partial run.  */
   ignore_value (system ("rm -rf " BASE "*"));
 

--- a/tests/test-version-etc.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-version-etc.c	Thu Aug 18 15:18:24 2016 +0200
@@ -19,14 +19,12 @@
 
 #include "version-etc.h"
 
-#include "progname.h"
 
 #define AUTHORS "Sergey Poznyakoff", "Eric Blake"
 
 int
 main (int argc _GL_UNUSED, char **argv)
 {
-  set_program_name (argv[0]);
   version_etc (stdout, "test-version-etc", "dummy", "0", AUTHORS,
                (const char *) NULL);
   return 0;

--- a/tests/test-xalloc-die.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-xalloc-die.c	Thu Aug 18 15:18:24 2016 +0200
@@ -19,12 +19,10 @@
 #include <config.h>
 
 #include "xalloc.h"
-#include "progname.h"
 
 int
 main (int argc _GL_UNUSED, char **argv)
 {
-  set_program_name (argv[0]);
   xalloc_die ();
   return 0;
 }

--- a/tests/test-xfprintf-posix.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-xfprintf-posix.c	Thu Aug 18 15:18:24 2016 +0200
@@ -25,7 +25,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "progname.h"
 #include "macros.h"
 
 #include "test-fprintf-posix.h"
@@ -33,8 +32,6 @@
 int
 main (int argc _GL_UNUSED, char *argv[])
 {
-  set_program_name (argv[0]);
-
   test_function (xfprintf);
   return 0;
 }

--- a/tests/test-xmemdup0.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-xmemdup0.c	Thu Aug 18 15:18:24 2016 +0200
@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "progname.h"
 #include "macros.h"
 
 int
@@ -32,8 +31,6 @@
   char buffer[10] = { 'a', 'b', 'c', 'd', '\0',
                       'f', 'g', 'h', 'i', 'j'   };
 
-  set_program_name (argv[0]);
-
   /* Empty string.  */
   {
     char *result = xmemdup0 (NULL, 0);

--- a/tests/test-xprintf-posix.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-xprintf-posix.c	Thu Aug 18 15:18:24 2016 +0200
@@ -24,7 +24,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "progname.h"
 #include "macros.h"
 
 #include "test-printf-posix.h"
@@ -32,8 +31,6 @@
 int
 main (int argc _GL_UNUSED, char *argv[])
 {
-  set_program_name (argv[0]);
-
   test_function (xprintf);
   return 0;
 }

--- a/tests/test-xstrtol.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-xstrtol.c	Thu Aug 18 15:18:24 2016 +0200
@@ -29,8 +29,6 @@
 # define __spec "ld"
 #endif
 
-char *program_name;
-
 /* Don't show the program name in error messages.  */
 static void
 print_no_progname (void)
@@ -43,7 +41,6 @@
   strtol_error s_err;
   int i;
 
-  program_name = argv[0];
   error_print_progname = print_no_progname;
 
   for (i = 1; i < argc; i++)

--- a/tests/test-xvasprintf.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-xvasprintf.c	Thu Aug 18 15:18:24 2016 +0200
@@ -31,7 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "progname.h"
 #include "macros.h"
 
 static char *
@@ -129,8 +128,6 @@
 int
 main (int argc _GL_UNUSED, char *argv[])
 {
-  set_program_name (argv[0]);
-
   test_xvasprintf ();
   test_xasprintf ();
 

--- a/tests/test-yesno.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/test-yesno.c	Thu Aug 18 15:18:24 2016 +0200
@@ -27,8 +27,6 @@
 #include "closein.h"
 #include "binary-io.h"
 
-char *program_name;
-
 /* Test yesno.  Without arguments, read one line.  If first argument
    is zero, close stdin before attempting to read one line.
    Otherwise, read the number of lines specified by first
@@ -37,7 +35,6 @@
 main (int argc, char **argv)
 {
   int i = 1;
-  program_name = argv[0];
 
   /* yesno recommends that all clients use close_stdin in main.  */
   atexit (close_stdin);

--- a/tests/uniname/test-uninames.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/uniname/test-uninames.c	Thu Aug 18 15:18:24 2016 +0200
@@ -23,7 +23,6 @@
 
 #include "xalloc.h"
 #include "uniname.h"
-#include "progname.h"
 
 /* The names according to the UnicodeData.txt file, modified to contain the
    Hangul syllable names, as described in the Unicode 3.0 book.  */
@@ -367,8 +366,6 @@
   int error = 0;
   int i;
 
-  set_program_name (argv[0]);
-
   for (i = 1; i < argc && strcmp (argv[i], "--") != 0; i++)
     fill_names (argv[i]);
 

--- a/tests/uninorm/test-u32-nfc-big.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/uninorm/test-u32-nfc-big.c	Thu Aug 18 15:18:24 2016 +0200
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 
 #include "unistr.h"
-#include "progname.h"
 #include "test-u32-normalize-big.h"
 
 static int
@@ -102,7 +101,6 @@
 {
   struct normalization_test_file file;
 
-  set_program_name (argv[0]);
   read_normalization_test_file (argv[1], &file);
 
   test_specific (&file, check);

--- a/tests/uninorm/test-u32-nfd-big.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/uninorm/test-u32-nfd-big.c	Thu Aug 18 15:18:24 2016 +0200
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 
 #include "unistr.h"
-#include "progname.h"
 #include "test-u32-normalize-big.h"
 
 static int
@@ -102,7 +101,6 @@
 {
   struct normalization_test_file file;
 
-  set_program_name (argv[0]);
   read_normalization_test_file (argv[1], &file);
 
   test_specific (&file, check);

--- a/tests/uninorm/test-u32-nfkc-big.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/uninorm/test-u32-nfkc-big.c	Thu Aug 18 15:18:24 2016 +0200
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 
 #include "unistr.h"
-#include "progname.h"
 #include "test-u32-normalize-big.h"
 
 static int
@@ -99,7 +98,6 @@
 {
   struct normalization_test_file file;
 
-  set_program_name (argv[0]);
   read_normalization_test_file (argv[1], &file);
 
   test_specific (&file, check);

--- a/tests/uninorm/test-u32-nfkd-big.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/uninorm/test-u32-nfkd-big.c	Thu Aug 18 15:18:24 2016 +0200
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 
 #include "unistr.h"
-#include "progname.h"
 #include "test-u32-normalize-big.h"
 
 static int
@@ -99,7 +98,6 @@
 {
   struct normalization_test_file file;
 
-  set_program_name (argv[0]);
   read_normalization_test_file (argv[1], &file);
 
   test_specific (&file, check);

--- a/tests/unistdio/test-u16-vsnprintf1.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/unistdio/test-u16-vsnprintf1.c	Thu Aug 18 15:18:24 2016 +0200
@@ -29,7 +29,6 @@
 
 #include "unistr.h"
 #include "xalloc.h"
-#include "progname.h"
 #include "macros.h"
 
 #include "test-u16-printf1.h"
@@ -63,8 +62,6 @@
 int
 main (int argc, char *argv[])
 {
-  set_program_name (argv[0]);
-
   test_vsnprintf ();
 
   return 0;

--- a/tests/unistdio/test-u16-vsprintf1.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/unistdio/test-u16-vsprintf1.c	Thu Aug 18 15:18:24 2016 +0200
@@ -29,7 +29,6 @@
 
 #include "unistr.h"
 #include "xalloc.h"
-#include "progname.h"
 #include "macros.h"
 
 #include "test-u16-printf1.h"
@@ -63,8 +62,6 @@
 int
 main (int argc, char *argv[])
 {
-  set_program_name (argv[0]);
-
   test_vsprintf ();
 
   return 0;

--- a/tests/unistdio/test-u32-vsnprintf1.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/unistdio/test-u32-vsnprintf1.c	Thu Aug 18 15:18:24 2016 +0200
@@ -29,7 +29,6 @@
 
 #include "unistr.h"
 #include "xalloc.h"
-#include "progname.h"
 #include "macros.h"
 
 #include "test-u32-printf1.h"
@@ -63,8 +62,6 @@
 int
 main (int argc, char *argv[])
 {
-  set_program_name (argv[0]);
-
   test_vsnprintf ();
 
   return 0;

--- a/tests/unistdio/test-u32-vsprintf1.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/unistdio/test-u32-vsprintf1.c	Thu Aug 18 15:18:24 2016 +0200
@@ -29,7 +29,6 @@
 
 #include "unistr.h"
 #include "xalloc.h"
-#include "progname.h"
 #include "macros.h"
 
 #include "test-u32-printf1.h"
@@ -63,8 +62,6 @@
 int
 main (int argc, char *argv[])
 {
-  set_program_name (argv[0]);
-
   test_vsprintf ();
 
   return 0;

--- a/tests/unistdio/test-u8-vsnprintf1.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/unistdio/test-u8-vsnprintf1.c	Thu Aug 18 15:18:24 2016 +0200
@@ -29,7 +29,6 @@
 
 #include "unistr.h"
 #include "xalloc.h"
-#include "progname.h"
 #include "macros.h"
 
 #include "test-u8-printf1.h"
@@ -63,8 +62,6 @@
 int
 main (int argc, char *argv[])
 {
-  set_program_name (argv[0]);
-
   test_vsnprintf ();
 
   return 0;

--- a/tests/unistdio/test-u8-vsprintf1.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/unistdio/test-u8-vsprintf1.c	Thu Aug 18 15:18:24 2016 +0200
@@ -29,7 +29,6 @@
 
 #include "unistr.h"
 #include "xalloc.h"
-#include "progname.h"
 #include "macros.h"
 
 #include "test-u8-printf1.h"
@@ -63,8 +62,6 @@
 int
 main (int argc, char *argv[])
 {
-  set_program_name (argv[0]);
-
   test_vsprintf ();
 
   return 0;

--- a/tests/unistdio/test-ulc-vsnprintf1.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/unistdio/test-ulc-vsnprintf1.c	Thu Aug 18 15:18:24 2016 +0200
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include "xalloc.h"
-#include "progname.h"
 #include "macros.h"
 
 #include "test-ulc-printf1.h"
@@ -56,8 +55,6 @@
 int
 main (int argc, char *argv[])
 {
-  set_program_name (argv[0]);
-
   test_vsnprintf ();
 
   return 0;

--- a/tests/unistdio/test-ulc-vsprintf1.c	Thu Aug 18 15:18:23 2016 +0200
+++ b/tests/unistdio/test-ulc-vsprintf1.c	Thu Aug 18 15:18:24 2016 +0200
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include "xalloc.h"
-#include "progname.h"
 #include "macros.h"
 
 #include "test-ulc-printf1.h"
@@ -56,8 +55,6 @@
 int
 main (int argc, char *argv[])
 {
-  set_program_name (argv[0]);
-
   test_vsprintf ();
 
   return 0;