run-all-extension-tests in make check

diff --git a/configure.ac b/configure.ac
index fa6960bc4d91a3b304aa511bc01355a2df3faed8..4f42fdbe799818744cf3b911adc4f18f09f6b309 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -971,6 +971,7 @@ share/extensions/Makefile
 share/extensions/alphabet_soup/Makefile
 share/extensions/Barcode/Makefile
 share/extensions/Poly3DObjects/Makefile
+share/extensions/test/Makefile
 share/extensions/xaml2svg/Makefile
 share/filters/Makefile
 share/fonts/Makefile

diff --git a/share/extensions/Makefile.am b/share/extensions/Makefile.am
index d60426c9e03ee52bb15881ff62fc0f976286329a..01577acf5d28a5cb4c01fb056405d49b72fdf038 100644 (file)
--- a/share/extensions/Makefile.am
+++ b/share/extensions/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = \
        alphabet_soup \
        Barcode \
        Poly3DObjects \
+       test \
        xaml2svg
 
 extensiondir = $(datadir)/inkscape/extensions
@@ -54,7 +55,7 @@ extensions = \
        ffgeom.py\
        fig2dev-ext.py \
        flatten.py \
-        foldablebox.py \
+       foldablebox.py \
        fractalize.py \
        funcplot.py \
        gears.py\
@@ -174,7 +175,7 @@ modules = \
        extrude.inx \
        fig_input.inx \
        flatten.inx \
-        foldablebox.inx \
+       foldablebox.inx \
        fractalize.inx \
        funcplot.inx \
        gears.inx\

diff --git a/share/extensions/test/Makefile.am b/share/extensions/test/Makefile.am
new file mode 100644 (file)
index 0000000..64a0b66
--- /dev/null
+++ b/share/extensions/test/Makefile.am
@@ -0,0 +1,4 @@
+
+# List of all tests to be run.
+#TESTS = svgcalendar.test.py
+# that is not working :-/
\ No newline at end of file

diff --git a/share/extensions/test/run-all-extension-tests b/share/extensions/test/run-all-extension-tests
index db3ddd9c2a5a514e42a2b908b47567a727a13d79..b1ad95f7928e6d79160e0a997982e8b02a1e579e 100755 (executable)
--- a/share/extensions/test/run-all-extension-tests
+++ b/share/extensions/test/run-all-extension-tests
@@ -1,9 +1,6 @@
 #!/bin/bash
 
-echo "
- #########################
-      Extension Tests
- #########################"
+echo -e "\n##### Extension Tests #####"
 
 cd "$(dirname "$0")"
 

diff --git a/share/extensions/test/svgcalendar.test.py b/share/extensions/test/svgcalendar.test.py
index cb2054754b98c834ee11235f37fd835ea9f4e449..7b93c9b38ef5891252272b966f54f80f1cc50351 100755 (executable)
--- a/share/extensions/test/svgcalendar.test.py
+++ b/share/extensions/test/svgcalendar.test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python\r
+#!/usr/bin/env python
 
 import sys
 sys.path.append('..') # this line allows to import the extension code

diff --git a/src/Makefile.am b/src/Makefile.am
index 6c267d0f4ef17e22e1299a6756386ea479ed22e7..cb6e1b9030d58814cbcf340241b73d287b198ec4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -263,7 +263,7 @@ check_PROGRAMS = cxxtests
 # "make distcheck".
 
 # List of all tests to be run.
-TESTS = $(check_PROGRAMS)
+TESTS = $(check_PROGRAMS) ../share/extensions/test/run-all-extension-tests
 
 # including the the testsuites here ensures that they get distributed
 cxxtests_SOURCES = cxxtests.cpp $(CXXTEST_TESTSUITES)