Enable exception handling for CxxTest in Makefiles

diff --git a/src/Makefile.am b/src/Makefile.am
index 09e52576bf58f350c1ca2c7c83c0a88b9e156108..3dc9e7cd7a63eef40176788f0007eb7762c1d73c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -256,7 +256,7 @@ check_PROGRAMS =    \
 
 test-src.cpp: \
                $(test_src_includes)
-               $(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o test-src.cpp     \
+               $(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh --template=$(srcdir)/selfname.tpl -root -o test-src.cpp   \
                $(test_src_includes)
 
 test_src_SOURCES = \

diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert
index 7db15cf397a3118c9c73ec5e80b6ac0f861b1209..9857cd386a960cb095e8ff3a6c1413b7a294f2b4 100644 (file)
--- a/src/display/Makefile_insert
+++ b/src/display/Makefile_insert
@@ -136,7 +136,7 @@ display/test-display-main.cpp: display/test-display.cpp
        $(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o display/test-display-main.cpp $(display_test_display_includes)
 
 display/test-display.cpp: $(display_test_display_includes)
-       $(top_srcdir)/cxxtest/cxxtestgen.pl -part -o display/test-display.cpp $(display_test_display_includes)
+       $(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh -part -o display/test-display.cpp $(display_test_display_includes)
 
 display_test_display_includes = \
        $(srcdir)/display/bezier-utils-test.h \

diff --git a/src/helper/Makefile_insert b/src/helper/Makefile_insert
index 26b2f46b2054494feaea30006b77cfd077fea5f7..432b3861c5eb909344dd0432ebe2e901c24c4cea 100644 (file)
--- a/src/helper/Makefile_insert
+++ b/src/helper/Makefile_insert
@@ -61,7 +61,7 @@ helper/test-helper-main.cpp: helper/test-helper.cpp
        $(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o helper/test-helper-main.cpp $(helper_test_helper_includes)
 
 helper/test-helper.cpp: $(helper_test_helper_includes)
-       $(top_srcdir)/cxxtest/cxxtestgen.pl -part -o helper/test-helper.cpp $(helper_test_helper_includes)
+       $(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh -part -o helper/test-helper.cpp $(helper_test_helper_includes)
 
 helper_test_helper_includes = \
        $(srcdir)/helper/units-test.h

diff --git a/src/libnr/Makefile_insert b/src/libnr/Makefile_insert
index 1ddc7d880949ae90e9dd021ba399e1fb7145fc04..3b99f8d39fe137025d22ed8602eaf5a2cddf7849 100644 (file)
--- a/src/libnr/Makefile_insert
+++ b/src/libnr/Makefile_insert
@@ -110,7 +110,7 @@ libnr/test-nr-main.cpp: libnr/test-nr.cpp
        $(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o libnr/test-nr-main.cpp $(libnr_test_nr_includes)
 
 libnr/test-nr.cpp: $(libnr_test_nr_includes)
-       $(top_srcdir)/cxxtest/cxxtestgen.pl -part -o libnr/test-nr.cpp $(libnr_test_nr_includes)
+       $(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh -part -o libnr/test-nr.cpp $(libnr_test_nr_includes)
 
 libnr_test_nr_includes = \
        $(srcdir)/libnr/nr-compose-test.h       \

diff --git a/src/svg/Makefile_insert b/src/svg/Makefile_insert
index 48d945301edd27abd469bbdde06e116c276d6808..e8f31b3c82d96056ff0375c8d3ce7f8287f59314 100644 (file)
--- a/src/svg/Makefile_insert
+++ b/src/svg/Makefile_insert
@@ -42,7 +42,7 @@ svg/test-svg-main.cpp: svg/test-svg.cpp
        $(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o svg/test-svg-main.cpp $(svg_test_svg_includes)
 
 svg/test-svg.cpp: $(svg_test_svg_includes) svg/Makefile_insert
-       $(top_srcdir)/cxxtest/cxxtestgen.pl -part -o svg/test-svg.cpp $(svg_test_svg_includes)
+       $(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh -part -o svg/test-svg.cpp $(svg_test_svg_includes)
 
 svg_test_svg_includes = \
        $(srcdir)/svg/css-ostringstream-test.h  \

diff --git a/src/util/Makefile_insert b/src/util/Makefile_insert
index 23ed42ac817e97078ee456c9e156597015a199ef..e4a89d046212c8070c0773bd190aac6d20d6e85e 100644 (file)
--- a/src/util/Makefile_insert
+++ b/src/util/Makefile_insert
@@ -32,7 +32,7 @@ util/test-util-main.cpp: util/test-util.cpp
        $(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o util/test-util-main.cpp $(util_test_util_includes)
 
 util/test-util.cpp: $(util_test_util_includes)
-       $(top_srcdir)/cxxtest/cxxtestgen.pl -part -o util/test-util.cpp $(util_test_util_includes)
+       $(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh -part -o util/test-util.cpp $(util_test_util_includes)
 
 util_test_util_includes = \
        $(srcdir)/util/list-container-test.h

diff --git a/src/xml/Makefile_insert b/src/xml/Makefile_insert
index 2027b38d1457e70acf1482d53ad4ae7614e55075..46be9edfaf3c8163a14ff50dd31d8b1ccf385deb 100644 (file)
--- a/src/xml/Makefile_insert
+++ b/src/xml/Makefile_insert
@@ -56,7 +56,7 @@ xml/test-xml-main.cpp: xml/test-xml.cpp $(xml_test_xml_includes)
        $(top_srcdir)/cxxtest/cxxtestgen.pl --template=$(srcdir)/selfname.tpl -root -o xml/test-xml-main.cpp $(xml_test_xml_includes)
 
 xml/test-xml.cpp: $(xml_test_xml_includes)
-       $(top_srcdir)/cxxtest/cxxtestgen.pl -part -o xml/test-xml.cpp $(xml_test_xml_includes)
+       $(top_srcdir)/cxxtest/cxxtestgen.pl --have-eh -part -o xml/test-xml.cpp $(xml_test_xml_includes)
 
 xml_test_xml_includes = \
        $(srcdir)/xml/repr-action-test.h        \