4 files changed, 14 insertions, 9 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 507ac2bc..e54f5dd8 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,11 @@
+2012-01-18  Roland McGrath  <[email protected]>
+
+	* 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 <[email protected]>.
+
 2011-07-09  Roland McGrath  <[email protected]>
 
 	* sha1-tst.c: File removed.
diff --git a/tests/asm-tst4.c b/tests/asm-tst4.c
index 54d054c2..19cceb59 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 <[email protected]>, 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 2a8b3f02..09917fe6 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 <[email protected]>, 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 bd6a71df..8fb9efb8 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 <[email protected]>, 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);