tests: invoke LLVM tools through their corresponding macros

20 files changed, 26 insertions, 22 deletions

diff --git a/test/Feature/BitcastAlias.ll b/test/Feature/BitcastAlias.ll
index cf84df06..c432acf7 100644
--- a/test/Feature/BitcastAlias.ll
+++ b/test/Feature/BitcastAlias.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -f -o %t1.bc
+; RUN: %llvmas %s -f -o %t1.bc
 ; RUN: rm -rf %t.klee-out
 ; RUN: %klee --output-dir=%t.klee-out --optimize=false %t1.bc > %t2
 ; RUN: grep PASS %t2
diff --git a/test/Feature/BitcastAliasMD2U.ll b/test/Feature/BitcastAliasMD2U.ll
index bf43d8c3..aa2d3011 100644
--- a/test/Feature/BitcastAliasMD2U.ll
+++ b/test/Feature/BitcastAliasMD2U.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -f -o %t1.bc
+; RUN: %llvmas %s -f -o %t1.bc
 ; RUN: rm -rf %t.klee-out
 ; RUN: %klee --output-dir=%t.klee-out --optimize=false -search=nurs:md2u %t1.bc > %t2
 ; RUN: grep PASS %t2
diff --git a/test/Feature/ConstantArray.ll b/test/Feature/ConstantArray.ll
index 32d4934c..176addb6 100644
--- a/test/Feature/ConstantArray.ll
+++ b/test/Feature/ConstantArray.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -f -o %t1.bc
+; RUN: %llvmas %s -f -o %t1.bc
 ; RUN: rm -rf %t.klee-out
 ; RUN: %klee --output-dir=%t.klee-out --optimize=false %t1.bc 2>&1 | FileCheck %s
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
diff --git a/test/Feature/ConstantStruct.ll b/test/Feature/ConstantStruct.ll
index 57ca1663..1ccd5044 100644
--- a/test/Feature/ConstantStruct.ll
+++ b/test/Feature/ConstantStruct.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -f -o %t1.bc
+; RUN: %llvmas %s -f -o %t1.bc
 ; RUN: rm -rf %t.klee-out
 ; RUN: %klee --output-dir=%t.klee-out --optimize=false %t1.bc > %t2
 ; RUN: grep PASS %t2
diff --git a/test/Feature/GetElementPtr.ll b/test/Feature/GetElementPtr.ll
index e92b27c2..e0adfd79 100644
--- a/test/Feature/GetElementPtr.ll
+++ b/test/Feature/GetElementPtr.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -f -o %t1.bc
+; RUN: %llvmas %s -f -o %t1.bc
 ; RUN: rm -rf %t.klee-out
 ; RUN: %klee --output-dir=%t.klee-out --optimize=false %t1.bc > %t2
 ; RUN: grep PASS %t2
diff --git a/test/Feature/GlobalVariable.ll b/test/Feature/GlobalVariable.ll
index 7b567bcb..e7f31e4f 100644
--- a/test/Feature/GlobalVariable.ll
+++ b/test/Feature/GlobalVariable.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -f -o %t1.bc
+; RUN: %llvmas %s -f -o %t1.bc
 ; RUN: rm -rf %t.klee-out
 ; Run KLEE and expect it to error out but not crash
 ; RUN: not %klee --output-dir=%t.klee-out --optimize=false %t1.bc 2> %t2
diff --git a/test/Feature/ImpliedValue.c.failing b/test/Feature/ImpliedValue.c.failing
index dd4d8f55..2673d69f 100644
--- a/test/Feature/ImpliedValue.c.failing
+++ b/test/Feature/ImpliedValue.c.failing
@@ -1,7 +1,7 @@
 // RUN: rm -f %t4.out %t4.err %t4.log
 // RUN: %llvmgcc %s -emit-llvm -O2 -c -o %t1.bc
-// RUN: llvm-as -f ../_utils._ll -o %t2.bc
-// RUN: llvm-ld --optimize=false -link-as-library %t1.bc %t2.bc -o %t3.bc
+// RUN: %llvmas -f ../_utils._ll -o %t2.bc
+// RUN: %llvm-ld --optimize=false -link-as-library %t1.bc %t2.bc -o %t3.bc
 // RUN: rm -rf %t.klee-out
 // RUN: %klee --output-dir=%t.klee-out --log-file %t4.log --debug-check-for-implied-values %t3.bc > %t4.out 2> %t4.err
 // RUN: ls %t.klee-out | not grep .err
diff --git a/test/Feature/InsertExtractValue.ll b/test/Feature/InsertExtractValue.ll
index b4e7ab55..9df3eec5 100644
--- a/test/Feature/InsertExtractValue.ll
+++ b/test/Feature/InsertExtractValue.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -f -o %t1.bc
+; RUN: %llvmas %s -f -o %t1.bc
 ; RUN: rm -rf %t.klee-out
 ; RUN: %klee --output-dir=%t.klee-out --optimize=false %t1.bc > %t2
 ; RUN: grep PASS %t2
diff --git a/test/Feature/asm_lifting.ll b/test/Feature/asm_lifting.ll
index 4f414eeb..d99db0cf 100644
--- a/test/Feature/asm_lifting.ll
+++ b/test/Feature/asm_lifting.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -f -o %t1.bc
+; RUN: %llvmas %s -f -o %t1.bc
 ; RUN: rm -rf %t.klee-out
 ; RUN: %klee --output-dir=%t.klee-out --optimize=false %t1.bc
 ; RUN: FileCheck %s --input-file=%t.klee-out/assembly.ll
diff --git a/test/Intrinsics/IntrinsicTrap.ll b/test/Intrinsics/IntrinsicTrap.ll
index c88a328a..5ac2fa73 100644
--- a/test/Intrinsics/IntrinsicTrap.ll
+++ b/test/Intrinsics/IntrinsicTrap.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -f -o %t1.bc
+; RUN: %llvmas %s -f -o %t1.bc
 ; RUN: rm -rf %t.klee-out
 ; RUN: %klee --output-dir=%t.klee-out --optimize=false %t1.bc
 ; RUN: FileCheck %s --input-file=%t.klee-out/assembly.ll
diff --git a/test/Intrinsics/Overflow.ll b/test/Intrinsics/Overflow.ll
index 31311029..f11e7da5 100644
--- a/test/Intrinsics/Overflow.ll
+++ b/test/Intrinsics/Overflow.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -f -o %t1.bc
+; RUN: %llvmas %s -f -o %t1.bc
 ; RUN: rm -rf %t.klee-out
 ; RUN: %klee --output-dir=%t.klee-out --optimize=false %t1.bc > %t2
 ; RUN: grep PASS %t2
diff --git a/test/Intrinsics/OverflowMul.ll b/test/Intrinsics/OverflowMul.ll
index 9343fdd8..b51c8bd8 100644
--- a/test/Intrinsics/OverflowMul.ll
+++ b/test/Intrinsics/OverflowMul.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -f -o %t1.bc
+; RUN: %llvmas %s -f -o %t1.bc
 ; RUN: rm -rf %t.klee-out
 ; RUN: %klee --output-dir=%t.klee-out --optimize=false %t1.bc > %t2
 ; RUN: grep PASS %t2
diff --git a/test/Intrinsics/Saturating.ll b/test/Intrinsics/Saturating.ll
index cce8b6cb..15aad409 100644
--- a/test/Intrinsics/Saturating.ll
+++ b/test/Intrinsics/Saturating.ll
@@ -1,5 +1,5 @@
 ; REQUIRES: geq-llvm-8.0
-; RUN: llvm-as %s -f -o %t1.bc
+; RUN: %llvmas %s -f -o %t1.bc
 ; RUN: rm -rf %t.klee-out
 ; RUN: %klee --output-dir=%t.klee-out --optimize=false %t1.bc | FileCheck %s
 
diff --git a/test/lit.cfg b/test/lit.cfg
index cd56527c..84ad0c79 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -103,6 +103,10 @@ config.substitutions.append(
 config.substitutions.append(
   ('%llvmar', os.path.join(llvm_tools_dir, 'llvm-ar'))
 )
+# Add a substitution for llvm-link
+config.substitutions.append(
+  ('%llvmlink', os.path.join(llvm_tools_dir, 'llvm-link'))
+)
 
 # Add a substition for libkleeruntest
 config.substitutions.append(
diff --git a/test/regression/2007-08-01-bool-zext-in-call.ll b/test/regression/2007-08-01-bool-zext-in-call.ll
index d8b2cec0..ee77d80c 100644
--- a/test/regression/2007-08-01-bool-zext-in-call.ll
+++ b/test/regression/2007-08-01-bool-zext-in-call.ll
@@ -1,5 +1,5 @@
 ; RUN: rm -rf %t.klee-out
-; RUN: llvm-as -f %s -o - | %klee --output-dir=%t.klee-out
+; RUN: %llvmas -f %s -o - | %klee --output-dir=%t.klee-out
 ; RUN: not test -f %t.klee-out/test0001.abort.err
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/test/regression/2007-08-16-invalid-constant-value.c b/test/regression/2007-08-16-invalid-constant-value.c
index 28f81268..c49357f8 100644
--- a/test/regression/2007-08-16-invalid-constant-value.c
+++ b/test/regression/2007-08-16-invalid-constant-value.c
@@ -1,7 +1,7 @@
 // RUN: rm -f %t4.out %t4.err %t4.log
 // RUN: %clang %s -emit-llvm -O2 -c -o %t1.bc
-// RUN: llvm-as -f %p/../Feature/_utils._ll -o %t2.bc
-// RUN: llvm-link %t1.bc %t2.bc -o %t3.bc
+// RUN: %llvmas -f %p/../Feature/_utils._ll -o %t2.bc
+// RUN: %llvmlink %t1.bc %t2.bc -o %t3.bc
 // RUN: rm -rf %t.klee-out
 // RUN: %klee --output-dir=%t.klee-out %t3.bc
 
diff --git a/test/regression/2018-10-28-alias-to-alias.ll b/test/regression/2018-10-28-alias-to-alias.ll
index a1af6d16..44264845 100644
--- a/test/regression/2018-10-28-alias-to-alias.ll
+++ b/test/regression/2018-10-28-alias-to-alias.ll
@@ -1,5 +1,5 @@
 ; RUN: rm -rf %t.klee-out
-; RUN: llvm-as -f %s -o - | %klee --output-dir=%t.klee-out
+; RUN: %llvmas -f %s -o - | %klee --output-dir=%t.klee-out
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/test/regression/2018-10-30-llvm-pr39177.ll b/test/regression/2018-10-30-llvm-pr39177.ll
index 601a37bd..027d0d30 100644
--- a/test/regression/2018-10-30-llvm-pr39177.ll
+++ b/test/regression/2018-10-30-llvm-pr39177.ll
@@ -1,5 +1,5 @@
 ; RUN: rm -rf %t.klee-out
-; RUN: llvm-as -f %s -o - | %klee -optimize -output-dir=%t.klee-out | FileCheck %s
+; RUN: %llvmas -f %s -o - | %klee -optimize -output-dir=%t.klee-out | FileCheck %s
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
diff --git a/test/regression/2019-08-01-trap-instruction.ll b/test/regression/2019-08-01-trap-instruction.ll
index 2ef57aa2..46dcda86 100644
--- a/test/regression/2019-08-01-trap-instruction.ll
+++ b/test/regression/2019-08-01-trap-instruction.ll
@@ -1,5 +1,5 @@
 ; RUN: rm -rf %t.klee-out
-; RUN: llvm-as -f %s -o - | %klee --output-dir=%t.klee-out
+; RUN: %llvmas -f %s -o - | %klee --output-dir=%t.klee-out
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
@@ -20,4 +20,4 @@ entry:
   ret i32 0
 }
 
-declare void @llvm.trap() noreturn nounwind
\ No newline at end of file
+declare void @llvm.trap() noreturn nounwind
diff --git a/test/regression/2019-08-02-missing-switch-default.ll b/test/regression/2019-08-02-missing-switch-default.ll
index b8a88db4..55e4224d 100644
--- a/test/regression/2019-08-02-missing-switch-default.ll
+++ b/test/regression/2019-08-02-missing-switch-default.ll
@@ -1,5 +1,5 @@
 ; RUN: rm -rf %t.klee-out
-; RUN: llvm-as -f %s -o %t.bc
+; RUN: %llvmas -f %s -o %t.bc
 ; RUN: %klee --switch-type=internal --output-dir=%t.klee-out %t.bc
 ; RUN: FileCheck --input-file=%t.klee-out/info %s
 ; CHECK: KLEE: done: completed paths = 3