summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJohn Criswell <criswell@uiuc.edu>2003-06-20 16:14:49 +0000
committerJohn Criswell <criswell@uiuc.edu>2003-06-20 16:14:49 +0000
commit259a144ef56b6471e4d42a12206b2781b39e6a27 (patch)
tree4e0a582dd3f07060009b9979e3800f4226a5f42f /test
parent5b836c4a06c584544647d5b013b193510ac5ced5 (diff)
downloadllvm-259a144ef56b6471e4d42a12206b2781b39e6a27.tar.gz
llvm-259a144ef56b6471e4d42a12206b2781b39e6a27.tar.bz2
llvm-259a144ef56b6471e4d42a12206b2781b39e6a27.tar.xz
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
Diffstat (limited to 'test')
-rwxr-xr-xtest/Feature/TestAsmDisasm.sh12
-rwxr-xr-xtest/Feature/TestOptimizer.sh13
2 files changed, 23 insertions, 2 deletions
diff --git a/test/Feature/TestAsmDisasm.sh b/test/Feature/TestAsmDisasm.sh
index 0b8faef9b2..a492f8f305 100755
--- 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 648d7168ea..10008ee111 100755
--- 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