Fix libc++ testcases

* remove wrapper script invocation and script
* add build instruction to test cases
* added additional checks
* add check to avoid execution of tests if KLEE is not compiled with
libc++

1 files changed, 5 insertions, 4 deletions

diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp
index 4e04dacc..ee115de3 100644
--- a/tools/klee/main.cpp
+++ b/tools/klee/main.cpp
@@ -289,9 +289,10 @@ namespace {
            cl::cat(TerminationCat));
 
   cl::opt<bool>
-  UseLibcxx("use-libcxx",
-           cl::desc("Link the llvm libc++ library into the bitcode"),
-           cl::init(0));
+  Libcxx("libcxx",
+           cl::desc("Link the llvm libc++ library into the bitcode (default=false)"),
+           cl::init(false),
+           cl::cat(LinkCat));
 }
 
 namespace klee {
@@ -1267,7 +1268,7 @@ int main(int argc, char **argv, char **envp) {
     preparePOSIX(loadedModules, libcPrefix);
   }
 
-  if (UseLibcxx) {
+  if (Libcxx) {
 #ifndef SUPPORT_KLEE_LIBCXX
     klee_error("Klee was not compiled with libcxx support");
 #else