Changes to make test scripts more reliable

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

diff --git a/test/Feature/TestAsmDisasm.sh b/test/Feature/TestAsmDisasm.sh
index 641dd2aea9685d9fc8e455b82ca3babbabe57ffe..56e383328c100a5338bd3fde4e029af3848c7c62 100755 (executable)
--- a/test/Feature/TestAsmDisasm.sh
+++ b/test/Feature/TestAsmDisasm.sh
@@ -11,7 +11,7 @@ export LD_LIBRARY_PATH
 # FIXME: We must strip symbols, because the symbol tables are not output in 
 # sorted order in the bytecode :(
 
-../tools/as/as   < $1      | opt -q -strip > $1.bc.1 || exit 1
+../tools/as/as   < $1      | ../tools/opt/opt -q -strip > $1.bc.1 || exit 1
 ../tools/dis/dis < $1.bc.1 > $1.ll.1 || exit 2
 ../tools/as/as   < $1.ll.1 > $1.bc.2 || exit 3
 ../tools/dis/dis < $1.bc.2 > $1.ll.2 || exit 4

diff --git a/test/Feature/TestOptimizer.sh b/test/Feature/TestOptimizer.sh
index 5473647118eb8c8a0c4129cb81c8f8feccc6c6a4..12afa77270fc70f7e42557fb4b19d60d357767fc 100755 (executable)
--- a/test/Feature/TestOptimizer.sh
+++ b/test/Feature/TestOptimizer.sh
@@ -8,8 +8,8 @@ export LD_LIBRARY_PATH
 # Should not be able to optimize further!
 ../tools/opt/opt -q -constprop -dce < $1.bc.1 > $1.bc.2 || exit 2
 
-dis < $1.bc.1 > $1.ll.1 || exit 3
-dis < $1.bc.2 > $1.ll.2 || exit 3
+../tools/dis/dis < $1.bc.1 > $1.ll.1 || exit 3
+../tools/dis/dis < $1.bc.2 > $1.ll.2 || exit 3
 diff $1.ll.[12] || exit 3
 
 # Try out SCCP