aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2012-01-22 10:16:31 +0100
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2012-01-22 10:16:31 +0100
commit5f4449a47b299ba9f8c37987f2bbfa5c06a56f45 (patch)
tree6259dba27bcacf81408be47e17a3b1ebadba7f8e /lib-python/conftest.py
parentMerge 2.7/ recent changes to modified-2.7/ (diff)
downloadpypy-5f4449a47b299ba9f8c37987f2bbfa5c06a56f45.tar.gz
pypy-5f4449a47b299ba9f8c37987f2bbfa5c06a56f45.tar.bz2
pypy-5f4449a47b299ba9f8c37987f2bbfa5c06a56f45.zip
List a test that was recently added, otherwise the test suite won't run :(
Diffstat (limited to 'lib-python/conftest.py')
-rw-r--r--lib-python/conftest.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib-python/conftest.py b/lib-python/conftest.py
index 27feeab252..b9fff99196 100644
--- a/lib-python/conftest.py
+++ b/lib-python/conftest.py
@@ -314,6 +314,7 @@ testmap = [
RegrTest('test_mmap.py'),
RegrTest('test_module.py', core=True),
RegrTest('test_modulefinder.py'),
+ RegrTest('test_msilib.py', skip=only_win32),
RegrTest('test_multibytecodec.py', usemodules='_multibytecodec'),
RegrTest('test_multibytecodec_support.py', skip="not a test"),
RegrTest('test_multifile.py'),