Merge pull request #166 from willemp/willem/klee_opts_to_concrete_tests

Fixes support for passing arguments to klee in the ConcreteTests.

22 files changed, 22 insertions, 22 deletions

diff --git a/test/Concrete/BitwiseOps.ll b/test/Concrete/BitwiseOps.ll
index 034dcace..5b910cad 100644
--- a/test/Concrete/BitwiseOps.ll
+++ b/test/Concrete/BitwiseOps.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 declare void @print_i32(i32)
 
diff --git a/test/Concrete/BoolReadWrite.ll b/test/Concrete/BoolReadWrite.ll
index a39d5ab5..f818ecaf 100644
--- a/test/Concrete/BoolReadWrite.ll
+++ b/test/Concrete/BoolReadWrite.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 declare void @print_i1(i1)
 
diff --git a/test/Concrete/Casts.ll b/test/Concrete/Casts.ll
index 3059a867..c78cffbe 100755
--- a/test/Concrete/Casts.ll
+++ b/test/Concrete/Casts.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 declare void @print_i32(i32)
 
diff --git a/test/Concrete/CmpEq.ll b/test/Concrete/CmpEq.ll
index cf81e3ca..cae5db5d 100644
--- a/test/Concrete/CmpEq.ll
+++ b/test/Concrete/CmpEq.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 declare void @print_i32(i32)
 
diff --git a/test/Concrete/ConcreteTest.py b/test/Concrete/ConcreteTest.py
index 290991b7..754c0fe6 100755
--- a/test/Concrete/ConcreteTest.py
+++ b/test/Concrete/ConcreteTest.py
@@ -30,7 +30,7 @@ def testFile(name, klee_path, lli_path):
     klee_out_path = "Output/%s.klee-out" % (baseName,)
     if os.path.exists(klee_out_path):
         shutil.rmtree(klee_out_path)
-    klee_cmd = [klee_path, '--output-dir=' + klee_out_path,  '--no-output', exeFile]
+    klee_cmd = klee_path.split() + ['--output-dir=' + klee_out_path,  '--no-output', exeFile]
     print("EXECUTING: %s" % (klee_cmd,))
     sys.stdout.flush()
 
diff --git a/test/Concrete/ConstantExpr.ll b/test/Concrete/ConstantExpr.ll
index 42fa2195..3a151a0f 100644
--- a/test/Concrete/ConstantExpr.ll
+++ b/test/Concrete/ConstantExpr.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 ; Most of the test below use the *address* of gInt as part of their computation,
 ; and then perform some operation (like x | ~x) which makes the result
diff --git a/test/Concrete/FloatingPointOps.ll b/test/Concrete/FloatingPointOps.ll
index 5c63ac83..5dd6d2fe 100644
--- a/test/Concrete/FloatingPointOps.ll
+++ b/test/Concrete/FloatingPointOps.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 ; casting error messages
 @.strTrunc     = internal constant [15 x i8] c"FPTrunc broken\00"
diff --git a/test/Concrete/GlobalInitializers.ll b/test/Concrete/GlobalInitializers.ll
index 6314b075..e3657dad 100755
--- a/test/Concrete/GlobalInitializers.ll
+++ b/test/Concrete/GlobalInitializers.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 declare void @print_i32(i32)
 
diff --git a/test/Concrete/GlobalUndef.ll b/test/Concrete/GlobalUndef.ll
index 71e380ae..99688bfd 100644
--- a/test/Concrete/GlobalUndef.ll
+++ b/test/Concrete/GlobalUndef.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %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/Concrete/GlobalVariable.ll b/test/Concrete/GlobalVariable.ll
index 8a29d0fb..61c7031b 100644
--- a/test/Concrete/GlobalVariable.ll
+++ b/test/Concrete/GlobalVariable.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 declare void @print_i32(i32)
 
diff --git a/test/Concrete/ICmp.ll b/test/Concrete/ICmp.ll
index 649ea4a8..352aa030 100644
--- a/test/Concrete/ICmp.ll
+++ b/test/Concrete/ICmp.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 declare void @print_i32(i32)
 
diff --git a/test/Concrete/OneCall.ll b/test/Concrete/OneCall.ll
index 32802929..f37e073c 100644
--- a/test/Concrete/OneCall.ll
+++ b/test/Concrete/OneCall.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 declare void @print_i32(i32)
 
diff --git a/test/Concrete/OverlappingPhiNodes.ll b/test/Concrete/OverlappingPhiNodes.ll
index beb4f68a..d3ff4fd3 100644
--- a/test/Concrete/OverlappingPhiNodes.ll
+++ b/test/Concrete/OverlappingPhiNodes.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 declare void @print_i32(i32)
 
diff --git a/test/Concrete/Select.ll b/test/Concrete/Select.ll
index eb7961b3..810cf55f 100644
--- a/test/Concrete/Select.ll
+++ b/test/Concrete/Select.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 declare void @print_i32(i32)
 
diff --git a/test/Concrete/Shifts.ll b/test/Concrete/Shifts.ll
index 828ecd18..bc0af930 100644
--- a/test/Concrete/Shifts.ll
+++ b/test/Concrete/Shifts.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 declare void @print_i32(i32)
 
diff --git a/test/Concrete/SimpleStoreAndLoad.ll b/test/Concrete/SimpleStoreAndLoad.ll
index d19521b4..1edad038 100644
--- a/test/Concrete/SimpleStoreAndLoad.ll
+++ b/test/Concrete/SimpleStoreAndLoad.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 declare void @print_i32(i32)
 
diff --git a/test/Concrete/UnconditionalBranch.ll b/test/Concrete/UnconditionalBranch.ll
index 104f1fa3..95719128 100644
--- a/test/Concrete/UnconditionalBranch.ll
+++ b/test/Concrete/UnconditionalBranch.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 declare void @print_i32(i32)
 
diff --git a/test/Concrete/UnconditionalBranchWithSimplePhi.ll b/test/Concrete/UnconditionalBranchWithSimplePhi.ll
index d290ac0e..d3bccb56 100644
--- a/test/Concrete/UnconditionalBranchWithSimplePhi.ll
+++ b/test/Concrete/UnconditionalBranchWithSimplePhi.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 declare void @print_i32(i32)
 
diff --git a/test/Concrete/UnorderedPhiNodes.ll b/test/Concrete/UnorderedPhiNodes.ll
index d28db091..bb2f70fb 100644
--- a/test/Concrete/UnorderedPhiNodes.ll
+++ b/test/Concrete/UnorderedPhiNodes.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 declare void @print_i32(i32)
 
diff --git a/test/Concrete/ackermann.c b/test/Concrete/ackermann.c
index b084a99f..4b322558 100644
--- a/test/Concrete/ackermann.c
+++ b/test/Concrete/ackermann.c
@@ -1,4 +1,4 @@
-// RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+// RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 #include <stdio.h>
 
diff --git a/test/Concrete/arith_test.ll b/test/Concrete/arith_test.ll
index eb0abcc8..f09cc7eb 100644
--- a/test/Concrete/arith_test.ll
+++ b/test/Concrete/arith_test.ll
@@ -1,4 +1,4 @@
-; RUN: %S/ConcreteTest.py --klee=%klee --lli=%lli %s
+; RUN: %S/ConcreteTest.py --klee='%klee' --lli=%lli %s
 
 define void @"test_simple_arith"(i16 %i0, i16 %j0) {
   %t1 = add i16 %i0, %j0
diff --git a/test/lit.cfg b/test/lit.cfg
index 25b48334..0be49bd8 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -98,7 +98,7 @@ if len(kleaver_extra_params) != 0:
 subs = [ ('%kleaver', 'kleaver', kleaver_extra_params), ('%klee','klee', klee_extra_params) ]
 for s,basename,extra_args in subs:
     config.substitutions.append( ( s,
-                                   "{0} {1}".format( os.path.join(klee_tools_dir, basename), extra_args )
+                                   "{0} {1}".format( os.path.join(klee_tools_dir, basename), extra_args ).strip()
                                  )
                                )