From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Tue, 24 Jul 2007 05:11:13 +0000 (+0000)
Subject: * mdemo/main.c (test_dl, main): Try lt_dlopenext as well.
X-Git-Tag: release-1-5-26~32
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=55673341d196eab9bf27c0a3f841c297ee5ef3a7;p=thirdparty%2Flibtool.git

* mdemo/main.c (test_dl, main): Try lt_dlopenext as well.
* tests/mdemo-exec.test: Also try absolute library names.
* THANKS: Update.
Report by Brian Barrett.
---

diff --git a/ChangeLog b/ChangeLog
index 3fdb4a978..57358b32d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* mdemo/main.c (test_dl, main): Try lt_dlopenext as well.
+	* tests/mdemo-exec.test: Also try absolute library names.
+	* THANKS: Update.
+	Report by Brian Barrett.
+
 2007-07-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* doc/fdl.texi: Update to GFDL 1.2.
diff --git a/THANKS b/THANKS
index 6349a7170..fb253bf03 100644
--- a/THANKS
+++ b/THANKS
@@ -58,7 +58,7 @@
   Paolo Bonzini			bonzini@gnu.org			  2003-03-01
   Noah Jeffrey Misch		noah@cs.caltech.edu		  2004-07-05
   Thorsten Glaser		tg@66h.42h.de			  2004-10-11
-  Peter Ekberg			peda@lysator.liu.se		  2005-04-12
+  Peter Rosin			peda@lysator.liu.se		  2005-04-12
   Tim Rice			tim@multitalents.net		  2005-11-10
   Eric Blake			ebb9@byu.net			  2006-01-18
 
@@ -71,10 +71,12 @@
   Andrey Slepuhin		pooh@msu.ru
   Aneesh Kumar K.V		kvaneesh@hotmail.com
   Brad Smith			brad@comstyle.com
+  Brian Barrett			brbarret@osl.iu.edu
   Bruno Haible			haible@ilog.fr
   Carl D. Roth			roth@cse.ucsc.edu
   Chris P. Ross			cross@eng.us.uu.net
   Christian Biesinger		cbiesinger@web.de
+  Christoph Egger		Christoph_Egger@gmx.de
   Christopher Hulbert		cchgroupmail@gmail.com
   Dalibor Topic			robilad@kaffe.org
   Daniel Reed			n@ml.org
diff --git a/mdemo/main.c b/mdemo/main.c
index 0e6cd25b0..dd95e22c8 100644
--- a/mdemo/main.c
+++ b/mdemo/main.c
@@ -1,5 +1,5 @@
 /* main.c -- mdemo test program
-   Copyright (C) 1998-2000 Free Software Foundation, Inc.
+   Copyright (C) 1998-2000, 2007 Free Software Foundation, Inc.
    Originally by Thomas Tanner <tanner@ffii.org>
    This file is part of GNU Libtool.
 
@@ -23,7 +23,7 @@ USA. */
 #include <stdio.h>
 
 int
-test_dl (filename)
+test_dl (filename, test_ext)
   char *filename;
 {
   lt_dlhandle handle;	
@@ -34,7 +34,11 @@ test_dl (filename)
   int *pnothing = 0;
   int ret = 0;
 
-  handle = lt_dlopen(filename);
+  if (test_ext)
+    handle = lt_dlopenext (filename);
+  else
+    handle = lt_dlopen (filename);
+
   if (!handle) {
     fprintf (stderr, "can't open the module %s!\n", filename);
     fprintf (stderr, "error was: %s\n", lt_dlerror());
@@ -170,6 +174,7 @@ main (argc, argv)
 {
   int i;
   int ret = 0;
+  char *p;
 
   printf ("Welcome to GNU libtool mdemo!\n");
 
@@ -184,8 +189,18 @@ main (argc, argv)
   }
 
   for (i = 1; i < argc; i++)
-    if (test_dl(argv[i]))
+  {
+    if (test_dl(argv[i], 0))
        ret = 1;
+    p = strrchr(argv[i], '.');
+    if (p)
+      {
+	*p = '\0';
+	if (test_dl(argv[i], 1))
+	  ret = 1;
+	*p = '.';
+      }
+  }
 
   if (test_dlself())
     ret = 1;
diff --git a/tests/mdemo-exec.test b/tests/mdemo-exec.test
index 26834b3df..565f64d45 100755
--- a/tests/mdemo-exec.test
+++ b/tests/mdemo-exec.test
@@ -20,16 +20,15 @@ fi
 echo "Executing uninstalled programs in ../mdemo"
 
 status=0
-if ../mdemo/mdemo_static ../mdemo/foo1.la ../mdemo/libfoo2.la; then :
-else
-  echo "$0: execution of ../mdemo/mdemo_static failed" 1>&2
-  status=1
-fi
-
-if ../mdemo/mdemo ../mdemo/foo1.la ../mdemo/libfoo2.la; then :
-else
-  echo "$0: execution of ../mdemo/mdemo failed" 1>&2
-  status=1
-fi
+for binary in ../mdemo/mdemo_static ../mdemo/mdemo; do
+  for args in "../mdemo/foo1.la ../mdemo/libfoo2.la" \
+              "\"`pwd`/../mdemo/foo1.la\" \"`pwd`/../mdemo/libfoo2.la\""; do
+    if eval "$binary $args"; then :
+    else
+      echo "$0: execution of $binary $args failed" 1>&2
+      status=1
+    fi
+  done
+done
 
 exit $status