* depdemo/main.c: Support -alt.

* tests/build-relink2.test: Try it.
This commit is contained in:
Alexandre Oliva 2000-09-05 12:54:02 +00:00
parent 03d0740c11
commit ce4a397e19
3 changed files with 14 additions and 2 deletions

View File

@ -1,5 +1,8 @@
2000-09-05 Alexandre Oliva <aoliva@redhat.com>
* depdemo/main.c: Support -alt.
* tests/build-relink2.test: Try it.
* ltconfig.in: Removed all references to what used to be
hardcode_into_libs=all. 2000-09-03's patch was wrong.
* ltmain.in: Likewise.

View File

@ -1,5 +1,6 @@
/* main.c -- inter-library dependency test program
Copyright (C) 1998-1999 Thomas Tanner <tanner@ffii.org>
Copyright (C) 1998, 1999, 2000 Free Software Foundation
by Thomas Tanner <tanner@ffii.org>
This file is part of GNU Libtool.
This program is free software; you can redistribute it and/or modify
@ -32,6 +33,9 @@ main (argc,argv)
func_l1(0);
func_l2(0);
func_l4(0);
if (argc == 2 && strcmp (argv[1], "-alt") == 0
&& var_l1 + var_l2 + var_l4 == 8)
return 0;
if (var_l1 + var_l2 + var_l4 != 20)
return 1;
return 0;

View File

@ -71,7 +71,12 @@ echo "removing libl3.la from ../depdemo/l3"
rm -rf l3/libl3.la l3/$objdir
echo "running ../depdemo/depdemo"
if ./depdemo; then
if ./depdemo ||
# On AIX 4.1, when the installed copy of libl3 is loaded, it brings
# with it the installed copies of libl1 and libl2, with disjoint
# counters var_l1 and var_l2. This is arguably acceptable behavior,
# but it's definitely not enough of a reason for the test to fail.
./depdemo -alt; then
:
elif test "x,$hardcode_action,$hardcode_direct" = x,relink,yes; then
echo "Ok, uninstalled programs fail after uninstalled libraries are removed"