The modifications to LD_LIBRARY_PATH now add the specified paths to the

beginning of LD_LIBRARY_PATH as opposed to simply replacing it.
This allows users to use LD_LIBRARY_PATH when running tests (useful for
when they have installed their own version of GCC).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6800 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Feature/TestAsmDisasm.sh b/test/Feature/TestAsmDisasm.sh
index 0b8faef9b22a8515f433999b16028a8b14940b47..a492f8f305be9ec683667c197a6acac335aaaeb4 100755 (executable)
--- a/test/Feature/TestAsmDisasm.sh
+++ b/test/Feature/TestAsmDisasm.sh
@@ -4,7 +4,17 @@
 
 rm -f test.bc.temp[12]
 
-LD_LIBRARY_PATH=$3
+#
+# Split the current LD_LIBRARY_PATH into two separate components.
+#
+FirstLDP=`echo $LD_LIBRARY_PATH | cut -d\; -f1`
+SecondLDP=`echo $LD_LIBRARY_PATH | cut -d\; -f2`
+
+#
+# Now create a new LD_LIBRARY_PATH with our command line options as
+# the first section.
+#
+LD_LIBRARY_PATH="$3:${FirstLDP}\;${SecondLDP}"
 export LD_LIBRARY_PATH
 
 AS=$2/as

diff --git a/test/Feature/TestOptimizer.sh b/test/Feature/TestOptimizer.sh
index 648d7168ea4cd3950099a699522ee89b66eab188..10008ee11136ab894f90ebcd27f8b535af045ffb 100755 (executable)
--- a/test/Feature/TestOptimizer.sh
+++ b/test/Feature/TestOptimizer.sh
@@ -1,5 +1,16 @@
 #!/bin/sh
-LD_LIBRARY_PATH=$3
+
+#
+# Split the current LD_LIBRARY_PATH into two separate components.
+#
+FirstLDP=`echo $LD_LIBRARY_PATH | cut -d\; -f1`
+SecondLDP=`echo $LD_LIBRARY_PATH | cut -d\; -f2`
+
+#
+# Now create a new LD_LIBRARY_PATH with our command line options as
+# the first section.
+#
+LD_LIBRARY_PATH="$3:${FirstLDP}\;${SecondLDP}"
 export LD_LIBRARY_PATH
 
 AS=$2/as