diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2014-09-14 14:33:23 -0700 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2014-09-14 14:33:23 -0700 |
| commit | e90e1ab38617253f67e7c6fa682e972b1c605b78 (patch) | |
| tree | fe78989ce6881d5e8f905a32ed5637cce0cf63f6 | |
| parent | 251a32eba660615bc1583fd7e328dde7641499c1 (diff) | |
| download | klee-e90e1ab38617253f67e7c6fa682e972b1c605b78.tar.gz | |
[tests] Enable running tests in parallel.
- This works fine for me on OS X now, and has been reported to work on Linux as well. Enabling across the board although presumably Travis will still only run single-threaded. - Fixes #147.
| -rwxr-xr-x | .travis/klee.sh | 3 | ||||
| -rw-r--r-- | test/Makefile | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/.travis/klee.sh b/.travis/klee.sh index 6c4ba745..266f8fce 100755 --- a/.travis/klee.sh +++ b/.travis/klee.sh @@ -94,10 +94,9 @@ make lit.site.cfg \ DISABLE_ASSERTIONS=${DISABLE_ASSERTIONS} \ ENABLE_OPTIMIZED=${ENABLE_OPTIMIZED} \ ENABLE_SHARED=0 -# Running is parallel is broken and there's no point on our "single core" VM anyway set +e # We want to let all the tests run before we exit -lit -v -j1 . +lit -v . RETURN="${RETURN}$?" ############################################################################### diff --git a/test/Makefile b/test/Makefile index 31896075..02d0a36f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -23,11 +23,10 @@ include Makefile.tests #===------------------------------------------------------------------------===# ULIMIT = ulimit -t 600 ; ulimit -d 512000 ; -# FIXME: Fix test suite so we can run lit in parallel. ifdef VERBOSE -LIT_ARGS := -j1 -v +LIT_ARGS := -v else -LIT_ARGS := -j1 -s -v +LIT_ARGS := -s -v endif ifdef TESTSUITE |