* V2 parser errors now set appropriate mime types for the encapsulated packet

[third_party/subunit] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a69a5db113b202e70b1368a4d61a5354d05097de..ae72035ec733fa9223ed37b62adf739752b57108 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,29 +1,41 @@
 EXTRA_DIST =  \
+       .bzrignore \
+       Apache-2.0 \
+       BSD \
        INSTALL \
        Makefile.am \
-       README \
        NEWS \
+       README \
+       all_tests.py \
+       c++/README \
        c/README \
        c/check-subunit-0.9.3.patch \
        c/check-subunit-0.9.5.patch \
        c/check-subunit-0.9.6.patch \
-       c++/README \
-       perl/subunit-diff \
        perl/Makefile.PL.in \
-       perl/lib/Subunit/Diff.pm \
        perl/lib/Subunit.pm \
-       python/subunit/tests/TestUtil.py \
+       perl/lib/Subunit/Diff.pm \
+       perl/subunit-diff \
+       python/iso8601/LICENSE \
+       python/iso8601/README \
+       python/iso8601/README.subunit \
+       python/iso8601/setup.py \
+       python/iso8601/test_iso8601.py \
        python/subunit/tests/__init__.py \
        python/subunit/tests/sample-script.py \
        python/subunit/tests/sample-two-script.py \
+       python/subunit/tests/test_chunked.py \
+       python/subunit/tests/test_details.py \
+       python/subunit/tests/test_progress_model.py \
        python/subunit/tests/test_subunit_filter.py \
+       python/subunit/tests/test_run.py \
        python/subunit/tests/test_subunit_stats.py \
        python/subunit/tests/test_subunit_tags.py \
        python/subunit/tests/test_tap2subunit.py \
-       python/subunit/tests/test_progress_model.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 \
@@ -35,17 +47,20 @@ 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-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
@@ -55,9 +70,13 @@ pcdata_DATA = \
 
 pkgpython_PYTHON = \
        python/subunit/__init__.py \
+       python/subunit/chunked.py \
+       python/subunit/details.py \
+       python/subunit/filters.py \
        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
@@ -70,9 +89,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
@@ -82,7 +98,7 @@ libcppunit_subunit_la_SOURCES = \
        c++/SubunitTestProgressListener.h
 
 tests_LDADD = @CHECK_LIBS@ $(top_builddir)/libsubunit.la
-c_tests_test_child_CFLAGS = $(SUBUNIT_CFLAGS) @CHECK_CFLAGS@
+c_tests_test_child_CFLAGS = -I$(top_srcdir)/c/include $(SUBUNIT_CFLAGS) @CHECK_CFLAGS@
 c_tests_test_child_LDADD = $(tests_LDADD)
 
 
@@ -91,9 +107,12 @@ 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 . -name "*.pyc" | xargs rm -f
+       find . -type f -name "*.pyc" -exec rm {} ';'
        rm -f perl/Makefile
 
 # Remove perl dir for VPATH builds.