diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2013-08-03 15:35:41 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2013-08-03 15:35:41 +0000 |
| commit | 1a58d13b2b974a9da674311899df9c2e16f3e053 (patch) | |
| tree | 3aad6a50ac5203ba757ba0e9d077f35eba7e2c4b | |
| parent | Fix extensions that fail unit tests (diff) | |
| download | inkscape-1a58d13b2b974a9da674311899df9c2e16f3e053.tar.gz inkscape-1a58d13b2b974a9da674311899df9c2e16f3e053.zip | |
Fix return code for extension tests]
(bzr r12446)
| -rwxr-xr-x | share/extensions/test/run-all-extension-tests | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 13 | ||||
| -rw-r--r-- | src/Makefile_insert | 2 |
3 files changed, 18 insertions, 3 deletions
diff --git a/share/extensions/test/run-all-extension-tests b/share/extensions/test/run-all-extension-tests index 1776e25b0..e7cba78f4 100755 --- a/share/extensions/test/run-all-extension-tests +++ b/share/extensions/test/run-all-extension-tests @@ -60,4 +60,8 @@ echo "" rm $py_cover_files $failed_tests -$fail && exit 1
\ No newline at end of file +if [ x$fail == xtrue ]; then + exit 1 +else + exit 0 +fi diff --git a/src/Makefile.am b/src/Makefile.am index 3a937d58b..3ca99869f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -248,7 +248,18 @@ check_PROGRAMS = cxxtests # List of all tests to be run. TESTS = $(check_PROGRAMS) ../share/extensions/test/run-all-extension-tests -XFAIL_TESTS = $(check_PROGRAMS) ../share/extensions/test/run-all-extension-tests + +# FIXME: Currently, a number of cxxtest tests fail. These should be fixed and +# the XFAIL_TESTS build target should be removed. +# See the following Launchpad bugs: +# +# LP #1202271 <cxxtest: preferences-test.h fails> +# LP #1208013 <cxxtest: curve-test.h fails> +# LP #1208002 <cxxtest: svg-length-test.h fails> +# LP #1208005 <cxxtest: svg-path-geom-test.h fails> +# LP #1207502 <cxxtest: svg-affine-test.h fails> + +XFAIL_TESTS = $(check_PROGRAMS) # including the the testsuites here ensures that they get distributed cxxtests_SOURCES = cxxtests.cpp $(CXXTEST_TESTSUITES) diff --git a/src/Makefile_insert b/src/Makefile_insert index 885b89d78..8fc00b2f6 100644 --- a/src/Makefile_insert +++ b/src/Makefile_insert @@ -284,8 +284,8 @@ CXXTEST_TESTSUITES += \ $(srcdir)/extract-uri-test.h \ $(srcdir)/marker-test.h \ $(srcdir)/mod360-test.h \ + $(srcdir)/preferences-test.h \ $(srcdir)/round-test.h \ - $(srcdir)/preferences-test.h \ $(srcdir)/sp-gradient-test.h \ $(srcdir)/sp-style-elem-test.h \ $(srcdir)/style-test.h \ |