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}.

diff --git a/ChangeLog b/ChangeLog
index 25e8b59043c90b494a7444b291790042301221c0..27a6abc9e0538398ca74f3fe88d6ca62ce50b66e 100644 (file)
--- 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 9b430cb50b5b9c51a5134190dede131bc50cd781..d28c95ffb0eb8e516f87a49215bcef02f7547c9d 100644 (file)
--- 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 88461e84bb49b72a7f7f44c8ec7d54b62e69364e..4a03a0bc5769fcb6568e21786c014f15baaa2964 100644 (file)
--- 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 4b0d2c2be9146a7f89a590d647e43288536b79b3..8a30022820fa676dcffd43db367007d3b89e8aaa 100755 (executable)
--- 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 ;;