diff options
author | Thorsten Behrens <tbehrens@novell.com> | 2010-05-03 14:53:08 +0200 |
---|---|---|
committer | Thorsten Behrens <tbehrens@novell.com> | 2010-05-03 14:53:08 +0200 |
commit | f92e5cfba3f386cdcf2cd4899e2210a0fdfd2ea3 (patch) | |
tree | 4ac0adf8eb285ca119962585b4d3580acb7b5ccc | |
parent | 01798042a491592476c2a691b05c7811bae82021 (diff) |
Tweaked test scripts
* maintainer/testall: also run nosetests
* tests/runtests: made PYTHONPATH work
-rw-r--r-- | examples/content/showcontent.out | 3 | ||||
-rwxr-xr-x | maintainer/testall | 4 | ||||
-rwxr-xr-x | tests/runtests | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/examples/content/showcontent.out b/examples/content/showcontent.out index ebc4f51..216d087 100644 --- a/examples/content/showcontent.out +++ b/examples/content/showcontent.out @@ -1,4 +1,5 @@ -<?xml version="1.0" ?><numbers attribute="3"><simple>1</simple><complex style="decimal">2</complex></numbers> +<?xml version="1.0" ?> +<numbers attribute="3"><simple>1</simple><complex style="decimal">2</complex></numbers> 3 8 15 diff --git a/maintainer/testall b/maintainer/testall index 797e045..5c46e42 100755 --- a/maintainer/testall +++ b/maintainer/testall @@ -10,4 +10,6 @@ python setup.py test && \ echo "Running ${TEST_PATH}" (cd ${dir} && ./test.sh >test.log 2>&1 ) || (echo "FAILED: ${TEST_PATH} (see test.log there)" ; exit 1 ) echo "Passed ${TEST_PATH}" - done + done && \ + ./tests/runtests + diff --git a/tests/runtests b/tests/runtests index 9135a58..e09c6f6 100755 --- a/tests/runtests +++ b/tests/runtests @@ -1,4 +1,4 @@ -PYTHONPATH=../src +PYTHONPATH=`pwd`/../pyxb export PYTHONPATH cd tests nosetests drivers/ |