From fed81b331283a3bf7a8608a5c6282ee8594b229f Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Fri, 27 Nov 2009 10:19:32 +0100
Subject: [PATCH] test-xalloc-die: avoid spurious failure due to libtool argv
 difference

In a libtool-enabled project, this test would fail due to a difference
in the emitted program name, e.g.,
-test-xalloc-die: memory exhausted
+/tmp/.../tests/.libs/lt-test-xalloc-die: memory exhausted
Use program to avoid that.
* modules/xalloc-die-tests (Depends-on): Add progname.
* tests/test-xalloc-die.c: Include progname.h".
(program_name): Remove decl.
(main): Call set_program_name.
* tests/test-xalloc-die.sh (compare): Remove unnecessary ${EXE}.
---
 ChangeLog                | 14 ++++++++++++++
 modules/xalloc-die-tests |  1 +
 tests/test-xalloc-die.c  |  6 +++---
 tests/test-xalloc-die.sh |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 25e8b5904..27a6abc9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-27  Jim Meyering  <meyering@redhat.com>
+
+	test-xalloc-die: avoid spurious failure due to libtool argv difference
+	In a libtool-enabled project, this test would fail due to a difference
+	in the emitted program name, e.g.,
+	-test-xalloc-die: memory exhausted
+	+/tmp/.../tests/.libs/lt-test-xalloc-die: memory exhausted
+	Use program to avoid that.
+	* modules/xalloc-die-tests (Depends-on): Add progname.
+	* tests/test-xalloc-die.c: Include progname.h".
+	(program_name): Remove decl.
+	(main): Call set_program_name.
+	* tests/test-xalloc-die.sh (compare): Remove unnecessary ${EXE}.
+
 2009-11-26  Richard Jones  <rjones@redhat.com>
 
 	w32sock: leave win32 error in place.
diff --git a/modules/xalloc-die-tests b/modules/xalloc-die-tests
index 9b430cb50..d28c95ffb 100644
--- a/modules/xalloc-die-tests
+++ b/modules/xalloc-die-tests
@@ -3,6 +3,7 @@ tests/test-xalloc-die.c
 tests/test-xalloc-die.sh
 
 Depends-on:
+progname
 
 Makefile.am:
 TESTS += test-xalloc-die.sh
diff --git a/tests/test-xalloc-die.c b/tests/test-xalloc-die.c
index 88461e84b..4a03a0bc5 100644
--- a/tests/test-xalloc-die.c
+++ b/tests/test-xalloc-die.c
@@ -19,12 +19,12 @@
 #include <config.h>
 
 #include "xalloc.h"
-
-char *program_name = "test-xalloc-die";
+#include "progname.h"
 
 int
-main (void)
+main (int argc, char **argv)
 {
+  set_program_name (argv[0]);
   xalloc_die ();
   return 0;
 }
diff --git a/tests/test-xalloc-die.sh b/tests/test-xalloc-die.sh
index 4b0d2c2be..8a3002282 100755
--- a/tests/test-xalloc-die.sh
+++ b/tests/test-xalloc-die.sh
@@ -34,7 +34,7 @@ tmpfiles="$tmpout $tmperr ${tmperr}2"
 
 PATH=".:$PATH"
 export PATH
-test-xalloc-die${EXEEXT} 2> ${tmperr} > ${tmpout}
+test-xalloc-die 2> ${tmperr} > ${tmpout}
 case $? in
   1) ;;
   *) (exit 1); exit 1 ;;
-- 
2.11.0