Open files in binary mode.

[third_party/subunit] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 310c0426ae500b5a39295672db4703354fbd2a7f..3d592cc5ee0bc209fcbd21385024ddb54173ba02 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST =  \
        Makefile.am \
        NEWS \
        README \
+       all_tests.py \
        c++/README \
        c/README \
        c/check-subunit-0.9.3.patch \
@@ -20,7 +21,6 @@ EXTRA_DIST =  \
        python/iso8601/README.subunit \
        python/iso8601/setup.py \
        python/iso8601/test_iso8601.py \
-       python/subunit/tests/TestUtil.py \
        python/subunit/tests/__init__.py \
        python/subunit/tests/sample-script.py \
        python/subunit/tests/sample-two-script.py \
@@ -33,8 +33,9 @@ EXTRA_DIST =  \
        python/subunit/tests/test_subunit_tags.py \
        python/subunit/tests/test_tap2subunit.py \
        python/subunit/tests/test_test_protocol.py \
+       python/subunit/tests/test_test_protocol2.py \
        python/subunit/tests/test_test_results.py \
-       runtests.py \
+       setup.py \
        shell/README \
        shell/share/subunit.sh \
        shell/subunit-ui.patch \
@@ -46,17 +47,21 @@ ACLOCAL_AMFLAGS = -I m4
 include_subunitdir = $(includedir)/subunit
 
 dist_bin_SCRIPTS = \
+       filters/subunit-1to2 \
+       filters/subunit-2to1 \
        filters/subunit-filter \
        filters/subunit-ls \
+       filters/subunit-notify \
+       filters/subunit-output \
        filters/subunit-stats \
        filters/subunit-tags \
+       filters/subunit2csv \
        filters/subunit2gtk \
        filters/subunit2junitxml \
        filters/subunit2pyunit \
        filters/tap2subunit
 
-TESTS_ENVIRONMENT = SHELL_SHARE='$(top_srcdir)/shell/share/' PYTHONPATH='$(abs_top_srcdir)/python':${PYTHONPATH}
-TESTS = runtests.py $(check_PROGRAMS)
+TESTS = $(check_PROGRAMS)
 
 ## install libsubunit.pc
 pcdatadir = $(libdir)/pkgconfig
@@ -72,6 +77,7 @@ pkgpython_PYTHON = \
        python/subunit/iso8601.py \
        python/subunit/progress_model.py \
        python/subunit/run.py \
+       python/subunit/v2.py \
        python/subunit/test_results.py
 
 lib_LTLIBRARIES = libsubunit.la
@@ -84,9 +90,6 @@ include_subunit_HEADERS = \
 check_PROGRAMS = \
        c/tests/test_child
 
-check_SCRIPTS = \
-       runtests.py
-
 libsubunit_la_SOURCES = \
        c/lib/child.c \
        c/include/subunit/child.h
@@ -105,6 +108,9 @@ all-local: perl/Makefile
 
 check-local: perl/Makefile
        $(MAKE) -C perl check
+       SHELL_SHARE='$(top_srcdir)/shell/share/' \
+       PYTHONPATH='$(abs_top_srcdir)/python':'$(abs_top_srcdir)':${PYTHONPATH} \
+       $(PYTHON) -m testtools.run all_tests.test_suite
 
 clean-local:
        find . -type f -name "*.pyc" -exec rm {} ';'