diff options
| author | Steve Kowalik <steven@wedontsleep.org> | 2014-01-07 14:18:31 +0800 |
|---|---|---|
| committer | Steve Kowalik <steven@wedontsleep.org> | 2014-01-07 15:58:11 +0800 |
| commit | 65a03e55cde262e52b2266b2e35f533e145a5f60 (patch) | |
| tree | bc880d00db3a23fbf41750790a75cfc33fe95aa1 /.functests | |
| parent | cd378edd2e087cf969aa6023f59ccf31f9f46b02 (diff) | |
| download | swift-65a03e55cde262e52b2266b2e35f533e145a5f60.tar.gz | |
Move the tests from functionalnosetests
Move the tests from functionalnosetests under functional, so we no
longer have two seperate trees for functional tests. This also drops
the 'nose' name from the directory, so that it doesn't end up with
confusion if we move to testr. Further, since there are no longer two
test runs in .functests, it nows looks very close to the other two.
Change-Id: I8de025c29d71f05072e257df24899927b82c1382
Diffstat (limited to '.functests')
| -rwxr-xr-x | .functests | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/.functests b/.functests index d4190f567..65a9ea191 100755 --- a/.functests +++ b/.functests @@ -4,12 +4,7 @@ SRC_DIR=$(python -c "import os; print os.path.dirname(os.path.realpath('$0'))") cd ${SRC_DIR}/test/functional nosetests --exe $@ -func1=$? +rvalue=$? cd - -cd ${SRC_DIR}/test/functionalnosetests -nosetests --exe $@ -func2=$? -cd - - -exit $((func1 + func2)) +exit $rvalue |