Update a few things that got forgotten in the great "bout" to "ktest"

renaming of '08.


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

7 files changed, 26 insertions, 24 deletions

diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp
index c3d2fcb4..f7c22fe0 100644
--- a/lib/Core/Executor.cpp
+++ b/lib/Core/Executor.cpp
@@ -2385,7 +2385,8 @@ std::string Executor::getAddressInfo(ExecutionState &state,
 
 void Executor::terminateState(ExecutionState &state) {
   if (replayOut && replayPosition!=replayOut->numObjects) {
-    klee_warning_once(replayOut, "replay did not consume all objects in .bout input.");
+    klee_warning_once(replayOut, 
+                      "replay did not consume all objects in test input.");
   }
 
   interpreterHandler->incPathsExplored();
@@ -2947,7 +2948,7 @@ void Executor::executeMakeSymbolic(ExecutionState &state,
 	    msg << "replace size mismatch: "
 		<< mo->name << "[" << mo->size << "]"
 		<< " vs " << obj->name << "[" << obj->numBytes << "]"
-		<< " in bout\n";
+		<< " in test\n";
 
             terminateStateOnError(state,
                                   msg.str(),
diff --git a/test/Runtime/POSIX/FD_Fail2.c b/test/Runtime/POSIX/FD_Fail2.c
index c9195f66..1eaeb649 100644
--- a/test/Runtime/POSIX/FD_Fail2.c
+++ b/test/Runtime/POSIX/FD_Fail2.c
@@ -1,12 +1,12 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t1.bc
 // RUN: %klee --libc=uclibc --posix-runtime --init-env %t1.bc --sym-files 0 0 --max-fail 1
-// RUN: test -f klee-last/test000001.bout
-// RUN: test -f klee-last/test000002.bout
-// RUN: test -f klee-last/test000003.bout
-// RUN: test -f klee-last/test000004.bout
-// RUN: test -f klee-last/test000005.bout
-// RUN: test -f klee-last/test000006.bout
-// RUN: test -f klee-last/test000007.bout
+// RUN: test -f klee-last/test000001.ktest
+// RUN: test -f klee-last/test000002.ktest
+// RUN: test -f klee-last/test000003.ktest
+// RUN: test -f klee-last/test000004.ktest
+// RUN: test -f klee-last/test000005.ktest
+// RUN: test -f klee-last/test000006.ktest
+// RUN: test -f klee-last/test000007.ktest
 
 #include <stdio.h>
 #include <assert.h>
diff --git a/test/Runtime/POSIX/FilePerm.c b/test/Runtime/POSIX/FilePerm.c
index 818d482f..0cb0a7e8 100644
--- a/test/Runtime/POSIX/FilePerm.c
+++ b/test/Runtime/POSIX/FilePerm.c
@@ -1,8 +1,8 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t.bc
 // RUN: %klee --posix-runtime --init-env %t.bc --sym-files 1 10 --sym-stdout 2>%t.log 
-// RUN: test -f klee-last/test000001.bout
-// RUN: test -f klee-last/test000002.bout
-// RUN: test -f klee-last/test000003.bout
+// RUN: test -f klee-last/test000001.ktest
+// RUN: test -f klee-last/test000002.ktest
+// RUN: test -f klee-last/test000003.ktest
 
 #include <stdio.h>       
 #include <sys/types.h>
diff --git a/test/Runtime/POSIX/Isatty.c b/test/Runtime/POSIX/Isatty.c
index 6a78dc96..294312dc 100644
--- a/test/Runtime/POSIX/Isatty.c
+++ b/test/Runtime/POSIX/Isatty.c
@@ -1,10 +1,10 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t.bc
 // RUN: %klee --libc=uclibc --posix-runtime --init-env %t.bc --sym-files 0 10 --sym-stdout 2>%t.log
 
-// RUN: test -f klee-last/test000001.bout
-// RUN: test -f klee-last/test000002.bout
-// RUN: test -f klee-last/test000003.bout
-// RUN: test -f klee-last/test000004.bout
+// RUN: test -f klee-last/test000001.ktest
+// RUN: test -f klee-last/test000002.ktest
+// RUN: test -f klee-last/test000003.ktest
+// RUN: test -f klee-last/test000004.ktest
 
 // RUN: grep -q "stdin is a tty" %t.log
 // RUN: grep -q "stdin is NOT a tty" %t.log
diff --git a/test/Runtime/POSIX/PrgName.c b/test/Runtime/POSIX/PrgName.c
index 19a56889..5bed4335 100644
--- a/test/Runtime/POSIX/PrgName.c
+++ b/test/Runtime/POSIX/PrgName.c
@@ -1,7 +1,7 @@
 // RUN: %llvmgcc %s -emit-llvm -O0 -c -o %t2.bc
 // RUN: %klee --init-env --posix-runtime --exit-on-error %t2.bc --sym-arg 10 >%t.log
-// RUN: test -f klee-last/test000001.bout
-// RUN: test -f klee-last/test000002.bout
+// RUN: test -f klee-last/test000001.ktest
+// RUN: test -f klee-last/test000002.ktest
 // RUN: grep -q "No" %t.log
 // RUN: grep -qv "Yes" %t.log
 
diff --git a/test/Runtime/POSIX/SeedAndFail.c b/test/Runtime/POSIX/SeedAndFail.c
index 64cf79bd..4d81e2d7 100644
--- a/test/Runtime/POSIX/SeedAndFail.c
+++ b/test/Runtime/POSIX/SeedAndFail.c
@@ -1,7 +1,7 @@
 // RUN: %llvmgcc %s -emit-llvm -g -O0 -c -o %t.bc
 // RUN: rm -rf tmp-123
 // RUN: %klee --libc=klee --output-dir=tmp-123 --posix-runtime --init-env %t.bc --sym-files 1 10  2>%t.log
-// RUN: klee --seed-out-dir=tmp-123 --zero-seed-extension --libc=uclibc --posix-runtime --init-env %t.bc --sym-files 1 10 --max-fail 1
+// RUN: %klee --seed-out-dir=tmp-123 --zero-seed-extension --libc=uclibc --posix-runtime --init-env %t.bc --sym-files 1 10 --max-fail 1
 // RUN: ls klee-last | grep -c assert | grep 4
 
 
diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp
index de18edcc..641577a2 100644
--- a/tools/klee/main.cpp
+++ b/tools/klee/main.cpp
@@ -192,7 +192,7 @@ private:
   unsigned m_testIndex;  // number of tests written so far
   unsigned m_pathsExplored; // number of paths explored so far
 
-  // used for writing .bout files
+  // used for writing .ktest files
   int m_argc;
   char **m_argv;
 
@@ -364,7 +364,7 @@ std::ostream *KleeHandler::openTestFile(const std::string &suffix, unsigned id)
 }
 
 
-/* Outputs all files (.bout, .pc, .cov etc.) describing a test case */
+/* Outputs all files (.ktest, .pc, .cov etc.) describing a test case */
 void KleeHandler::processTestCase(const ExecutionState &state,
                                   const char *errorMessage, 
                                   const char *errorSuffix) {
@@ -509,13 +509,14 @@ void KleeHandler::getOutFiles(std::string path,
   std::set<llvm::sys::Path> contents;
   std::string error;
   if (p.getDirectoryContents(contents, &error)) {
-    llvm::cerr << "ERROR: unable to read output directory: " << path << ": " << error << "\n";
+    llvm::cerr << "ERROR: unable to read output directory: " << path 
+               << ": " << error << "\n";
     exit(1);
   }
   for (std::set<llvm::sys::Path>::iterator it = contents.begin(),
          ie = contents.end(); it != ie; ++it) {
     std::string f = it->toString();
-    if (f.substr(f.size()-5,f.size()) == ".bout") {
+    if (f.substr(f.size()-6,f.size()) == ".ktest") {
       results.push_back(f);
     }
   }
@@ -1300,7 +1301,7 @@ int main(int argc, char **argv, char **envp) {
       interpreter->setReplayOut(out);
       llvm::cerr << "KLEE: replaying: " << *it << " (" << kTest_numBytes(out) << " bytes)"
                  << " (" << ++i << "/" << outFiles.size() << ")\n";
-      // XXX should put envp in .bout ?
+      // XXX should put envp in .ktest ?
       interpreter->runFunctionAsMain(mainFn, out->numArgs, out->args, pEnvp);
       if (interrupted) break;
     }