Skip to content

Commit 8865017

Browse files
committed
buildbot test running: run tests in MPL root dir (bypasses weird bug with scons build)
svn path=/trunk/matplotlib/; revision=7987
1 parent 802cb7f commit 8865017

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

test/_buildbot_test.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"""This script will install matplotlib to a virtual environment to
22
faciltate testing."""
3-
import shutil, os, sys, glob
4-
from subprocess import Popen, PIPE, STDOUT
3+
import os, glob
54

65
from _buildbot_util import check_call
76

@@ -13,10 +12,8 @@
1312
TARGET_py = os.path.join(TARGET,'bin','python')
1413
check_call('%s -c "import shutil,matplotlib; x=matplotlib.get_configdir(); shutil.rmtree(x)"'%TARGET_py)
1514

16-
17-
previous_test_images = glob.glob(os.path.join('test','failed-diff-*.png'))
15+
previous_test_images = glob.glob('failed-diff-*.png')
1816
for fname in previous_test_images:
1917
os.unlink(fname)
2018

21-
check_call('%s -c "import sys, matplotlib; success = matplotlib.test(verbosity=2); sys.exit(not success)"'%TARGET_py,
22-
cwd='test')
19+
check_call('%s -c "import sys, matplotlib; success = matplotlib.test(verbosity=2); sys.exit(not success)"'%TARGET_py)

test/_buildbot_test_postmortem.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
This is meant to be run from the mplroot directory."""
66

7-
import os, sys, glob, shutil
7+
import os, shutil
88

99
roots = ['test_matplotlib','test_plots']
1010
savedresults_dir = 'saved-results'
@@ -80,7 +80,6 @@ def path_split_all(fname):
8080

8181
# new matplotlib.testing infrastructure
8282

83-
os.chdir('test')
8483
for fname in get_recursive_filelist(['result_images']):
8584
# only images
8685
if not fname.endswith('.png'): continue

0 commit comments

Comments
 (0)