From: Roland McGrath <roland@hack.frob.com>
Date: Wed, 18 Jan 2012 21:57:08 +0000 (-0800)
Subject: Don't set LD_LIBRARY_PATH explicitly for command run inside test case.
X-Git-Tag: elfutils-0.153~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8ff18e0e8b8631fcc449cbd5a1ceba3f4a73e0d;p=thirdparty%2Felfutils.git

Don't set LD_LIBRARY_PATH explicitly for command run inside test case.
---

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 507ac2bcf..e54f5dd8e 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,11 @@
+2012-01-18  Roland McGrath  <roland@hack.frob.com>
+
+	* asm-tst4.c (main): Don't set LD_LIBRARY_PATH in system invocation;
+	it will have been inherited correctly from the test harness.
+	* asm-tst5.c (main): Likewise.
+	* asm-tst6.c (main): Likewise.
+	Reported by Serge Pavlov <serge.pavlov.at.gnu@gmail.com>.
+
 2011-07-09  Roland McGrath  <roland@hack.frob.com>
 
 	* sha1-tst.c: File removed.
diff --git a/tests/asm-tst4.c b/tests/asm-tst4.c
index 54d054c2d..19cceb591 100644
--- a/tests/asm-tst4.c
+++ b/tests/asm-tst4.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2004, 2005 Red Hat, Inc.
+/* Copyright (C) 2002-2012 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -101,8 +101,7 @@ main (void)
     }
 
   if (result == 0)
-    result = WEXITSTATUS (system ("\
-env LD_LIBRARY_PATH=../libelf ../src/elflint -q asm-tst4-out.o"));
+    result = WEXITSTATUS (system ("../src/elflint -q asm-tst4-out.o"));
 
   /* We don't need the file anymore.  */
   unlink (fname);
diff --git a/tests/asm-tst5.c b/tests/asm-tst5.c
index 2a8b3f025..09917fe63 100644
--- a/tests/asm-tst5.c
+++ b/tests/asm-tst5.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2004, 2005 Red Hat, Inc.
+/* Copyright (C) 2002-2012 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -113,8 +113,7 @@ main (void)
     }
 
   if (result == 0)
-    result = WEXITSTATUS (system ("\
-env LD_LIBRARY_PATH=../libelf ../src/elflint -q asm-tst5-out.o"));
+    result = WEXITSTATUS (system ("../src/elflint -q asm-tst5-out.o"));
 
   /* We don't need the file anymore.  */
   unlink (fname);
diff --git a/tests/asm-tst6.c b/tests/asm-tst6.c
index bd6a71df6..8fb9efb82 100644
--- a/tests/asm-tst6.c
+++ b/tests/asm-tst6.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2004, 2005 Red Hat, Inc.
+/* Copyright (C) 2002-2012 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -147,8 +147,7 @@ main (void)
     }
 
   if (result == 0)
-    result = WEXITSTATUS (system ("\
-env LD_LIBRARY_PATH=../libelf ../src/elflint -q asm-tst6-out.o"));
+    result = WEXITSTATUS (system ("../src/elflint -q asm-tst6-out.o"));
 
   /* We don't need the file anymore.  */
   unlink (fname);