diff options
author | Daniel Dunbar <daniel@zuster.org> | 2014-09-12 17:03:35 -0700 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2014-09-12 17:39:18 -0700 |
commit | 9b715dfc40311247b08daf5fa8695a95fd66106f (patch) | |
tree | e45588fba94a530653d8b6bcddafc5cda3e2adef /test/CXX | |
parent | 9a3cf72b8979213bcc6d235856bb0ddba4ee37c8 (diff) | |
download | klee-9b715dfc40311247b08daf5fa8695a95fd66106f.tar.gz |
[tests] Set --output-dir on all test runs, in support of running tests in parallel.
- It would be nice if there was an easier way to do this that didn't involve editing all of the tests (like running each test in its own directory), but this approach fixes #146 and doesn't involve changing 'lit' or writing a wrapper harness. My assumption is a lot of tests start are derived from another one, so hopefully following this convention won't be burdensome, and I updated 'make check' so that it will produce an error if any test runs klee without --output-dir (by checking for the existing of klee-last files). - This also helps with #147 but I still can't fully run tests in parallel (I start hitting STP errors).
Diffstat (limited to 'test/CXX')
-rw-r--r-- | test/CXX/ArrayNew.cpp | 3 | ||||
-rw-r--r-- | test/CXX/New.cpp | 3 | ||||
-rw-r--r-- | test/CXX/SimpleVirtual.cpp | 3 | ||||
-rw-r--r-- | test/CXX/StaticConstructor.cpp | 3 | ||||
-rw-r--r-- | test/CXX/StaticDestructor.cpp | 5 | ||||
-rw-r--r-- | test/CXX/Trivial.cpp | 3 |
6 files changed, 13 insertions, 7 deletions
diff --git a/test/CXX/ArrayNew.cpp b/test/CXX/ArrayNew.cpp index b564316d..6a54083a 100644 --- a/test/CXX/ArrayNew.cpp +++ b/test/CXX/ArrayNew.cpp @@ -1,5 +1,6 @@ // RUN: %llvmgxx %s -emit-llvm -O0 -c -o %t1.bc -// RUN: %klee --no-output --exit-on-error --no-externals %t1.bc +// RUN: rm -rf %t.klee-out +// RUN: %klee --output-dir=%t.klee-out --no-output --exit-on-error --no-externals %t1.bc #include <cassert> diff --git a/test/CXX/New.cpp b/test/CXX/New.cpp index f7ecf3be..5b90c7a4 100644 --- a/test/CXX/New.cpp +++ b/test/CXX/New.cpp @@ -1,5 +1,6 @@ // RUN: %llvmgxx %s -emit-llvm -O0 -c -o %t1.bc -// RUN: %klee --no-output --exit-on-error --no-externals %t1.bc +// RUN: rm -rf %t.klee-out +// RUN: %klee --output-dir=%t.klee-out --no-output --exit-on-error --no-externals %t1.bc #include <cassert> diff --git a/test/CXX/SimpleVirtual.cpp b/test/CXX/SimpleVirtual.cpp index 108722c6..b2db980d 100644 --- a/test/CXX/SimpleVirtual.cpp +++ b/test/CXX/SimpleVirtual.cpp @@ -1,5 +1,6 @@ // RUN: %llvmgxx %s -emit-llvm -O0 -c -o %t1.bc -// RUN: %klee --no-output --exit-on-error --no-externals %t1.bc +// RUN: rm -rf %t.klee-out +// RUN: %klee --output-dir=%t.klee-out --no-output --exit-on-error --no-externals %t1.bc #include <cassert> diff --git a/test/CXX/StaticConstructor.cpp b/test/CXX/StaticConstructor.cpp index 4974d59b..56fcb97b 100644 --- a/test/CXX/StaticConstructor.cpp +++ b/test/CXX/StaticConstructor.cpp @@ -1,5 +1,6 @@ // RUN: %llvmgxx %s -emit-llvm -O0 -c -o %t1.bc -// RUN: %klee --libc=klee --no-output --exit-on-error %t1.bc +// RUN: rm -rf %t.klee-out +// RUN: %klee --output-dir=%t.klee-out --libc=klee --no-output --exit-on-error %t1.bc #include <cassert> diff --git a/test/CXX/StaticDestructor.cpp b/test/CXX/StaticDestructor.cpp index 60390c2d..6e6f033d 100644 --- a/test/CXX/StaticDestructor.cpp +++ b/test/CXX/StaticDestructor.cpp @@ -1,8 +1,9 @@ // don't optimize this, llvm likes to turn the *p into unreachable // RUN: %llvmgxx %s -emit-llvm -g -O0 -c -o %t1.bc -// RUN: %klee --optimize=false --libc=uclibc --no-output %t1.bc 2> %t1.log -// RUN: grep ":16: memory error" %t1.log +// RUN: rm -rf %t.klee-out +// RUN: %klee --output-dir=%t.klee-out --optimize=false --libc=uclibc --no-output %t1.bc 2> %t1.log +// RUN: grep ":17: memory error" %t1.log #include <cassert> diff --git a/test/CXX/Trivial.cpp b/test/CXX/Trivial.cpp index 6c05459d..2b8ceed3 100644 --- a/test/CXX/Trivial.cpp +++ b/test/CXX/Trivial.cpp @@ -1,5 +1,6 @@ // RUN: %llvmgxx %s -emit-llvm -O0 -c -o %t1.bc -// RUN: %klee --no-output --exit-on-error %t1.bc +// RUN: rm -rf %t.klee-out +// RUN: %klee --output-dir=%t.klee-out --no-output --exit-on-error %t1.bc #include <cassert> |