some test fixes

Author: ladisgin

test/CMakeLists.txt

@@ -15,6 +15,7 @@ set(LLVM_TOOLS_DIR "${LLVM_TOOLS_BINARY_DIR}")
 set(LLVMCC "${LLVMCC} -I${CMAKE_SOURCE_DIR}/include")
 set(LLVMCXX "${LLVMCXX} -I${CMAKE_SOURCE_DIR}/include")
 set(NATIVE_CC "${CMAKE_C_COMPILER} ${CMAKE_C_FLAGS} -I ${CMAKE_SOURCE_DIR}/include")
+set(NATIVE_OBJCOPY "${CMAKE_OBJCOPY}")
 set(NATIVE_CXX "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_FLAGS} -I ${CMAKE_SOURCE_DIR}/include")
 set(TARGET_TRIPLE "${TARGET_TRIPLE}")
 

test/Replay/libkleeruntest/replay_mocks.c

@@ -1,13 +1,14 @@
 // REQUIRES: geq-llvm-11.0
+// REQUIRES: not-darwin
 // RUN: %clang %s -emit-llvm -g %O0opt -c -o %t.bc
 // RUN: rm -rf %t.klee-out
 // RUN: %klee --output-dir=%t.klee-out --external-calls=all --mock-strategy=naive %t.bc
-
 // RUN: %clang -c %t.bc -o %t.o
-// RUN: %llvmobjcopy --redefine-syms %t.klee-out/redefinitions.txt %t.o
-// RUN: %clang -o %t.klee-out/a.out %libkleeruntest %t.klee-out/externals.ll %t.o
+// RUN: %llc %t.klee-out/externals.ll -filetype=obj -o %t_externals.o
+// RUN: %objcopy --redefine-syms %t.klee-out/redefinitions.txt %t.o
+// RUN: %cc -no-pie %t_externals.o %t.o %libkleeruntest -Wl,-rpath %libkleeruntestdir -o %t_runner
 // RUN: test -f %t.klee-out/test000001.ktest
-// RUN: env KTEST_FILE=%t.klee-out/test000001.ktest %t.klee-out/a.out
+// RUN: env KTEST_FILE=%t.klee-out/test000001.ktest %t_runner
 
 extern int variable;
 

test/lit.cfg

@@ -90,7 +90,7 @@ if config.test_exec_root is None:
 
 
 # Add substitutions from lit.site.cfg
-subs = [ 'clangxx', 'clang', 'cc', 'cxx', 'O0opt', 'c_prefixes_8', 'c_prefixes_10', 'cpp_prefixes_10' ]
+subs = [ 'clangxx', 'clang', 'cc', 'objcopy', 'cxx', 'O0opt', 'c_prefixes_8', 'c_prefixes_10', 'cpp_prefixes_10' ]
 for name in subs:
   value = getattr(config, name, None)
   if value == None:
@@ -105,6 +105,12 @@ config.substitutions.append(
 config.substitutions.append(
   ('%lli', os.path.join(llvm_tools_dir, 'lli'))
 )
+
+# Add a substitution for llc.
+config.substitutions.append(
+  ('%llc', os.path.join(llvm_tools_dir, 'llc'))
+)
+
 # Add a substitution for llvm-as
 config.substitutions.append(
   ('%llvmas', os.path.join(llvm_tools_dir, 'llvm-as'))

test/lit.site.cfg.in

@@ -35,6 +35,7 @@ config.clang = "@LLVMCC@"
 config.clangxx = "@LLVMCXX@"
 
 config.cc = "@NATIVE_CC@"
+config.objcopy = "@NATIVE_OBJCOPY@"
 config.cxx = "@NATIVE_CXX@"
 
 # NOTE: any changes to compiler flags also have to be applied to