wok view inkscape/stuff/patches/0005-Fix_FTBFS_due_to_tests.patch @ rev 17293

shared-mime-info: force add tazpkg.xml (*.tazpkg is CPIO archives without it)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Thu Oct 30 01:06:47 2014 +0200 (2014-10-30)
parents
children
line source
1 From: Mattia Rizzolo <mattia@mapreri.org>
2 Date: Tue, 8 Jul 2014 14:14:42 +0200
3 Subject: Fix_FTBFS_due_to_tests
5 Fix FTBFS in the test suite, to let the tests run.
7 Last-Update: 2014-07-02
9 Signed-off-by: Matteo F. Vescovi <mfvescovi@gmail.com>
10 ---
11 src/cxxtests.cpp | 124 +++++++++++++++++++++++++++----------------------------
12 1 file changed, 62 insertions(+), 62 deletions(-)
14 diff --git a/src/cxxtests.cpp b/src/cxxtests.cpp
15 index 7324466..76ff6a7 100644
16 --- a/src/cxxtests.cpp
17 +++ b/src/cxxtests.cpp
18 @@ -23,12 +23,12 @@ int main( int argc, char *argv[] )
19 #include <cxxtest/TestRunner.h>
20 #include <cxxtest/RealDescriptions.h>
22 -#include "../../src/attributes-test.h"
23 +#include "attributes-test.h"
25 static AttributesTest *suite_AttributesTest = 0;
27 static CxxTest::List Tests_AttributesTest = { 0, 0 };
28 -CxxTest::DynamicSuiteDescription<AttributesTest> suiteDescription_AttributesTest( "../../src/attributes-test.h", 13, "AttributesTest", Tests_AttributesTest, suite_AttributesTest, 24, 25 );
29 +CxxTest::DynamicSuiteDescription<AttributesTest> suiteDescription_AttributesTest( "attributes-test.h", 13, "AttributesTest", Tests_AttributesTest, suite_AttributesTest, 24, 25 );
31 static class TestDescription_AttributesTest_testAttributes : public CxxTest::RealTestDescription {
32 public:
33 @@ -36,12 +36,12 @@ public:
34 void runTest() { if ( suite_AttributesTest ) suite_AttributesTest->testAttributes(); }
35 } testDescription_AttributesTest_testAttributes;
37 -#include "../../src/color-profile-test.h"
38 +#include "color-profile-test.h"
40 static ColorProfileTest *suite_ColorProfileTest = 0;
42 static CxxTest::List Tests_ColorProfileTest = { 0, 0 };
43 -CxxTest::DynamicSuiteDescription<ColorProfileTest> suiteDescription_ColorProfileTest( "../../src/color-profile-test.h", 13, "ColorProfileTest", Tests_ColorProfileTest, suite_ColorProfileTest, 45, 51 );
44 +CxxTest::DynamicSuiteDescription<ColorProfileTest> suiteDescription_ColorProfileTest( "color-profile-test.h", 13, "ColorProfileTest", Tests_ColorProfileTest, suite_ColorProfileTest, 45, 51 );
46 static class TestDescription_ColorProfileTest_testSetRenderingIntent : public CxxTest::RealTestDescription {
47 public:
48 @@ -61,12 +61,12 @@ public:
49 void runTest() { if ( suite_ColorProfileTest ) suite_ColorProfileTest->testSetName(); }
50 } testDescription_ColorProfileTest_testSetName;
52 -#include "../../src/dir-util-test.h"
53 +#include "dir-util-test.h"
55 static DirUtilTest suite_DirUtilTest;
57 static CxxTest::List Tests_DirUtilTest = { 0, 0 };
58 -CxxTest::StaticSuiteDescription suiteDescription_DirUtilTest( "../../src/dir-util-test.h", 9, "DirUtilTest", suite_DirUtilTest, Tests_DirUtilTest );
59 +CxxTest::StaticSuiteDescription suiteDescription_DirUtilTest( "dir-util-test.h", 9, "DirUtilTest", suite_DirUtilTest, Tests_DirUtilTest );
61 static class TestDescription_DirUtilTest_testBase : public CxxTest::RealTestDescription {
62 public:
63 @@ -74,12 +74,12 @@ public:
64 void runTest() { suite_DirUtilTest.testBase(); }
65 } testDescription_DirUtilTest_testBase;
67 -#include "../../src/extract-uri-test.h"
68 +#include "extract-uri-test.h"
70 static ExtractURITest suite_ExtractURITest;
72 static CxxTest::List Tests_ExtractURITest = { 0, 0 };
73 -CxxTest::StaticSuiteDescription suiteDescription_ExtractURITest( "../../src/extract-uri-test.h", 9, "ExtractURITest", suite_ExtractURITest, Tests_ExtractURITest );
74 +CxxTest::StaticSuiteDescription suiteDescription_ExtractURITest( "extract-uri-test.h", 9, "ExtractURITest", suite_ExtractURITest, Tests_ExtractURITest );
76 static class TestDescription_ExtractURITest_testBase : public CxxTest::RealTestDescription {
77 public:
78 @@ -99,12 +99,12 @@ public:
79 void runTest() { suite_ExtractURITest.testQuoted(); }
80 } testDescription_ExtractURITest_testQuoted;
82 -#include "../../src/marker-test.h"
83 +#include "marker-test.h"
85 static MarkerTest suite_MarkerTest;
87 static CxxTest::List Tests_MarkerTest = { 0, 0 };
88 -CxxTest::StaticSuiteDescription suiteDescription_MarkerTest( "../../src/marker-test.h", 14, "MarkerTest", suite_MarkerTest, Tests_MarkerTest );
89 +CxxTest::StaticSuiteDescription suiteDescription_MarkerTest( "marker-test.h", 14, "MarkerTest", suite_MarkerTest, Tests_MarkerTest );
91 static class TestDescription_MarkerTest_testMarkerLoc : public CxxTest::RealTestDescription {
92 public:
93 @@ -112,12 +112,12 @@ public:
94 void runTest() { suite_MarkerTest.testMarkerLoc(); }
95 } testDescription_MarkerTest_testMarkerLoc;
97 -#include "../../src/mod360-test.h"
98 +#include "mod360-test.h"
100 static Mod360Test suite_Mod360Test;
102 static CxxTest::List Tests_Mod360Test = { 0, 0 };
103 -CxxTest::StaticSuiteDescription suiteDescription_Mod360Test( "../../src/mod360-test.h", 12, "Mod360Test", suite_Mod360Test, Tests_Mod360Test );
104 +CxxTest::StaticSuiteDescription suiteDescription_Mod360Test( "mod360-test.h", 12, "Mod360Test", suite_Mod360Test, Tests_Mod360Test );
106 static class TestDescription_Mod360Test_testMod360 : public CxxTest::RealTestDescription {
107 public:
108 @@ -125,12 +125,12 @@ public:
109 void runTest() { suite_Mod360Test.testMod360(); }
110 } testDescription_Mod360Test_testMod360;
112 -#include "../../src/round-test.h"
113 +#include "round-test.h"
115 static RoundTest *suite_RoundTest = 0;
117 static CxxTest::List Tests_RoundTest = { 0, 0 };
118 -CxxTest::DynamicSuiteDescription<RoundTest> suiteDescription_RoundTest( "../../src/round-test.h", 10, "RoundTest", Tests_RoundTest, suite_RoundTest, 50, 51 );
119 +CxxTest::DynamicSuiteDescription<RoundTest> suiteDescription_RoundTest( "round-test.h", 10, "RoundTest", Tests_RoundTest, suite_RoundTest, 50, 51 );
121 static class TestDescription_RoundTest_testNonNegRound : public CxxTest::RealTestDescription {
122 public:
123 @@ -144,12 +144,12 @@ public:
124 void runTest() { if ( suite_RoundTest ) suite_RoundTest->testNonPosRoung(); }
125 } testDescription_RoundTest_testNonPosRoung;
127 -#include "../../src/preferences-test.h"
128 +#include "preferences-test.h"
130 static PreferencesTest suite_PreferencesTest;
132 static CxxTest::List Tests_PreferencesTest = { 0, 0 };
133 -CxxTest::StaticSuiteDescription suiteDescription_PreferencesTest( "../../src/preferences-test.h", 29, "PreferencesTest", suite_PreferencesTest, Tests_PreferencesTest );
134 +CxxTest::StaticSuiteDescription suiteDescription_PreferencesTest( "preferences-test.h", 29, "PreferencesTest", suite_PreferencesTest, Tests_PreferencesTest );
136 static class TestDescription_PreferencesTest_testStartingState : public CxxTest::RealTestDescription {
137 public:
138 @@ -193,12 +193,12 @@ public:
139 void runTest() { suite_PreferencesTest.testPreferencesEntryMethods(); }
140 } testDescription_PreferencesTest_testPreferencesEntryMethods;
142 -#include "../../src/sp-style-elem-test.h"
143 +#include "sp-style-elem-test.h"
145 static SPStyleElemTest *suite_SPStyleElemTest = 0;
147 static CxxTest::List Tests_SPStyleElemTest = { 0, 0 };
148 -CxxTest::DynamicSuiteDescription<SPStyleElemTest> suiteDescription_SPStyleElemTest( "../../src/sp-style-elem-test.h", 12, "SPStyleElemTest", Tests_SPStyleElemTest, suite_SPStyleElemTest, 43, 48 );
149 +CxxTest::DynamicSuiteDescription<SPStyleElemTest> suiteDescription_SPStyleElemTest( "sp-style-elem-test.h", 12, "SPStyleElemTest", Tests_SPStyleElemTest, suite_SPStyleElemTest, 43, 48 );
151 static class TestDescription_SPStyleElemTest_testSetType : public CxxTest::RealTestDescription {
152 public:
153 @@ -224,12 +224,12 @@ public:
154 void runTest() { if ( suite_SPStyleElemTest ) suite_SPStyleElemTest->testReadContent(); }
155 } testDescription_SPStyleElemTest_testReadContent;
157 -#include "../../src/style-test.h"
158 +#include "style-test.h"
160 static StyleTest *suite_StyleTest = 0;
162 static CxxTest::List Tests_StyleTest = { 0, 0 };
163 -CxxTest::DynamicSuiteDescription<StyleTest> suiteDescription_StyleTest( "../../src/style-test.h", 11, "StyleTest", Tests_StyleTest, suite_StyleTest, 37, 43 );
164 +CxxTest::DynamicSuiteDescription<StyleTest> suiteDescription_StyleTest( "style-test.h", 11, "StyleTest", Tests_StyleTest, suite_StyleTest, 37, 43 );
166 static class TestDescription_StyleTest_testOne : public CxxTest::RealTestDescription {
167 public:
168 @@ -237,12 +237,12 @@ public:
169 void runTest() { if ( suite_StyleTest ) suite_StyleTest->testOne(); }
170 } testDescription_StyleTest_testOne;
172 -#include "../../src/verbs-test.h"
173 +#include "verbs-test.h"
175 static VerbsTest suite_VerbsTest;
177 static CxxTest::List Tests_VerbsTest = { 0, 0 };
178 -CxxTest::StaticSuiteDescription suiteDescription_VerbsTest( "../../src/verbs-test.h", 7, "VerbsTest", suite_VerbsTest, Tests_VerbsTest );
179 +CxxTest::StaticSuiteDescription suiteDescription_VerbsTest( "verbs-test.h", 7, "VerbsTest", suite_VerbsTest, Tests_VerbsTest );
181 static class TestDescription_VerbsTest_testEnumLength : public CxxTest::RealTestDescription {
182 public:
183 @@ -262,12 +262,12 @@ public:
184 void runTest() { suite_VerbsTest.testFetch(); }
185 } testDescription_VerbsTest_testFetch;
187 -#include "../../src/display/curve-test.h"
188 +#include "display/curve-test.h"
190 static CurveTest *suite_CurveTest = 0;
192 static CxxTest::List Tests_CurveTest = { 0, 0 };
193 -CxxTest::DynamicSuiteDescription<CurveTest> suiteDescription_CurveTest( "../../src/display/curve-test.h", 8, "CurveTest", Tests_CurveTest, suite_CurveTest, 35, 36 );
194 +CxxTest::DynamicSuiteDescription<CurveTest> suiteDescription_CurveTest( "display/curve-test.h", 8, "CurveTest", Tests_CurveTest, suite_CurveTest, 35, 36 );
196 static class TestDescription_CurveTest_testGetSegmentCount : public CxxTest::RealTestDescription {
197 public:
198 @@ -329,12 +329,12 @@ public:
199 void runTest() { if ( suite_CurveTest ) suite_CurveTest->testPenultimatePoint(); }
200 } testDescription_CurveTest_testPenultimatePoint;
202 -#include "../../src/helper/units-test.h"
203 +#include "helper/units-test.h"
205 static UnitsTest *suite_UnitsTest = 0;
207 static CxxTest::List Tests_UnitsTest = { 0, 0 };
208 -CxxTest::DynamicSuiteDescription<UnitsTest> suiteDescription_UnitsTest( "../../src/helper/units-test.h", 7, "UnitsTest", Tests_UnitsTest, suite_UnitsTest, 17, 18 );
209 +CxxTest::DynamicSuiteDescription<UnitsTest> suiteDescription_UnitsTest( "helper/units-test.h", 7, "UnitsTest", Tests_UnitsTest, suite_UnitsTest, 17, 18 );
211 static class TestDescription_UnitsTest_testConversions : public CxxTest::RealTestDescription {
212 public:
213 @@ -348,12 +348,12 @@ public:
214 void runTest() { if ( suite_UnitsTest ) suite_UnitsTest->testUnitTable(); }
215 } testDescription_UnitsTest_testUnitTable;
217 -#include "../../src/libnr/in-svg-plane-test.h"
218 +#include "libnr/in-svg-plane-test.h"
220 static InSvgPlaneTest *suite_InSvgPlaneTest = 0;
222 static CxxTest::List Tests_InSvgPlaneTest = { 0, 0 };
223 -CxxTest::DynamicSuiteDescription<InSvgPlaneTest> suiteDescription_InSvgPlaneTest( "../../src/libnr/in-svg-plane-test.h", 9, "InSvgPlaneTest", Tests_InSvgPlaneTest, suite_InSvgPlaneTest, 31, 32 );
224 +CxxTest::DynamicSuiteDescription<InSvgPlaneTest> suiteDescription_InSvgPlaneTest( "libnr/in-svg-plane-test.h", 9, "InSvgPlaneTest", Tests_InSvgPlaneTest, suite_InSvgPlaneTest, 31, 32 );
226 static class TestDescription_InSvgPlaneTest_testInSvgPlane : public CxxTest::RealTestDescription {
227 public:
228 @@ -361,12 +361,12 @@ public:
229 void runTest() { if ( suite_InSvgPlaneTest ) suite_InSvgPlaneTest->testInSvgPlane(); }
230 } testDescription_InSvgPlaneTest_testInSvgPlane;
232 -#include "../../src/libnr/nr-compose-test.h"
233 +#include "libnr/nr-compose-test.h"
235 static NrComposeTest *suite_NrComposeTest = 0;
237 static CxxTest::List Tests_NrComposeTest = { 0, 0 };
238 -CxxTest::DynamicSuiteDescription<NrComposeTest> suiteDescription_NrComposeTest( "../../src/libnr/nr-compose-test.h", 35, "NrComposeTest", Tests_NrComposeTest, suite_NrComposeTest, 110, 111 );
239 +CxxTest::DynamicSuiteDescription<NrComposeTest> suiteDescription_NrComposeTest( "libnr/nr-compose-test.h", 35, "NrComposeTest", Tests_NrComposeTest, suite_NrComposeTest, 110, 111 );
241 static class TestDescription_NrComposeTest_testnr_R8G8B8A8_N_EMPTY_R8G8B8A8_N : public CxxTest::RealTestDescription {
242 public:
243 @@ -518,12 +518,12 @@ public:
244 void runTest() { if ( suite_NrComposeTest ) suite_NrComposeTest->testnr_R8G8B8_R8G8B8_R8G8B8A8_P_A8(); }
245 } testDescription_NrComposeTest_testnr_R8G8B8_R8G8B8_R8G8B8A8_P_A8;
247 -#include "../../src/libnr/nr-matrix-test.h"
248 +#include "libnr/nr-matrix-test.h"
250 static NrMatrixTest *suite_NrMatrixTest = 0;
252 static CxxTest::List Tests_NrMatrixTest = { 0, 0 };
253 -CxxTest::DynamicSuiteDescription<NrMatrixTest> suiteDescription_NrMatrixTest( "../../src/libnr/nr-matrix-test.h", 23, "NrMatrixTest", Tests_NrMatrixTest, suite_NrMatrixTest, 44, 45 );
254 +CxxTest::DynamicSuiteDescription<NrMatrixTest> suiteDescription_NrMatrixTest( "libnr/nr-matrix-test.h", 23, "NrMatrixTest", Tests_NrMatrixTest, suite_NrMatrixTest, 44, 45 );
256 static class TestDescription_NrMatrixTest_testCtorsAssignmentOp : public CxxTest::RealTestDescription {
257 public:
258 @@ -585,12 +585,12 @@ public:
259 void runTest() { if ( suite_NrMatrixTest ) suite_NrMatrixTest->testMatrixStarScale(); }
260 } testDescription_NrMatrixTest_testMatrixStarScale;
262 -#include "../../src/libnr/nr-point-fns-test.h"
263 +#include "libnr/nr-point-fns-test.h"
265 static NrPointFnsTest *suite_NrPointFnsTest = 0;
267 static CxxTest::List Tests_NrPointFnsTest = { 0, 0 };
268 -CxxTest::DynamicSuiteDescription<NrPointFnsTest> suiteDescription_NrPointFnsTest( "../../src/libnr/nr-point-fns-test.h", 12, "NrPointFnsTest", Tests_NrPointFnsTest, suite_NrPointFnsTest, 37, 38 );
269 +CxxTest::DynamicSuiteDescription<NrPointFnsTest> suiteDescription_NrPointFnsTest( "libnr/nr-point-fns-test.h", 12, "NrPointFnsTest", Tests_NrPointFnsTest, suite_NrPointFnsTest, 37, 38 );
271 static class TestDescription_NrPointFnsTest_testL1 : public CxxTest::RealTestDescription {
272 public:
273 @@ -634,12 +634,12 @@ public:
274 void runTest() { if ( suite_NrPointFnsTest ) suite_NrPointFnsTest->testIsUnitVector(); }
275 } testDescription_NrPointFnsTest_testIsUnitVector;
277 -#include "../../src/libnr/nr-rotate-test.h"
278 +#include "libnr/nr-rotate-test.h"
280 static NrRotateTest *suite_NrRotateTest = 0;
282 static CxxTest::List Tests_NrRotateTest = { 0, 0 };
283 -CxxTest::DynamicSuiteDescription<NrRotateTest> suiteDescription_NrRotateTest( "../../src/libnr/nr-rotate-test.h", 13, "NrRotateTest", Tests_NrRotateTest, suite_NrRotateTest, 29, 30 );
284 +CxxTest::DynamicSuiteDescription<NrRotateTest> suiteDescription_NrRotateTest( "libnr/nr-rotate-test.h", 13, "NrRotateTest", Tests_NrRotateTest, suite_NrRotateTest, 29, 30 );
286 static class TestDescription_NrRotateTest_testCtorsCompares : public CxxTest::RealTestDescription {
287 public:
288 @@ -677,12 +677,12 @@ public:
289 void runTest() { if ( suite_NrRotateTest ) suite_NrRotateTest->testOpDivRotateRotate(); }
290 } testDescription_NrRotateTest_testOpDivRotateRotate;
292 -#include "../../src/libnr/nr-rotate-fns-test.h"
293 +#include "libnr/nr-rotate-fns-test.h"
295 static NrRotateFnsTest *suite_NrRotateFnsTest = 0;
297 static CxxTest::List Tests_NrRotateFnsTest = { 0, 0 };
298 -CxxTest::DynamicSuiteDescription<NrRotateFnsTest> suiteDescription_NrRotateFnsTest( "../../src/libnr/nr-rotate-fns-test.h", 8, "NrRotateFnsTest", Tests_NrRotateFnsTest, suite_NrRotateFnsTest, 19, 20 );
299 +CxxTest::DynamicSuiteDescription<NrRotateFnsTest> suiteDescription_NrRotateFnsTest( "libnr/nr-rotate-fns-test.h", 8, "NrRotateFnsTest", Tests_NrRotateFnsTest, suite_NrRotateFnsTest, 19, 20 );
301 static class TestDescription_NrRotateFnsTest_testRotateDegrees : public CxxTest::RealTestDescription {
302 public:
303 @@ -690,12 +690,12 @@ public:
304 void runTest() { if ( suite_NrRotateFnsTest ) suite_NrRotateFnsTest->testRotateDegrees(); }
305 } testDescription_NrRotateFnsTest_testRotateDegrees;
307 -#include "../../src/libnr/nr-scale-test.h"
308 +#include "libnr/nr-scale-test.h"
310 static NrScaleTest *suite_NrScaleTest = 0;
312 static CxxTest::List Tests_NrScaleTest = { 0, 0 };
313 -CxxTest::DynamicSuiteDescription<NrScaleTest> suiteDescription_NrScaleTest( "../../src/libnr/nr-scale-test.h", 6, "NrScaleTest", Tests_NrScaleTest, suite_NrScaleTest, 20, 21 );
314 +CxxTest::DynamicSuiteDescription<NrScaleTest> suiteDescription_NrScaleTest( "libnr/nr-scale-test.h", 6, "NrScaleTest", Tests_NrScaleTest, suite_NrScaleTest, 20, 21 );
316 static class TestDescription_NrScaleTest_testXY_CtorArrayOperator : public CxxTest::RealTestDescription {
317 public:
318 @@ -739,12 +739,12 @@ public:
319 void runTest() { if ( suite_NrScaleTest ) suite_NrScaleTest->testOpDivScaleScale(); }
320 } testDescription_NrScaleTest_testOpDivScaleScale;
322 -#include "../../src/libnr/nr-translate-test.h"
323 +#include "libnr/nr-translate-test.h"
325 static NrTranslateTest *suite_NrTranslateTest = 0;
327 static CxxTest::List Tests_NrTranslateTest = { 0, 0 };
328 -CxxTest::DynamicSuiteDescription<NrTranslateTest> suiteDescription_NrTranslateTest( "../../src/libnr/nr-translate-test.h", 11, "NrTranslateTest", Tests_NrTranslateTest, suite_NrTranslateTest, 28, 29 );
329 +CxxTest::DynamicSuiteDescription<NrTranslateTest> suiteDescription_NrTranslateTest( "libnr/nr-translate-test.h", 11, "NrTranslateTest", Tests_NrTranslateTest, suite_NrTranslateTest, 28, 29 );
331 static class TestDescription_NrTranslateTest_testCtorsArrayOperator : public CxxTest::RealTestDescription {
332 public:
333 @@ -776,12 +776,12 @@ public:
334 void runTest() { if ( suite_NrTranslateTest ) suite_NrTranslateTest->testIdentity(); }
335 } testDescription_NrTranslateTest_testIdentity;
337 -#include "../../src/libnr/nr-types-test.h"
338 +#include "libnr/nr-types-test.h"
340 static NrTypesTest *suite_NrTypesTest = 0;
342 static CxxTest::List Tests_NrTypesTest = { 0, 0 };
343 -CxxTest::DynamicSuiteDescription<NrTypesTest> suiteDescription_NrTypesTest( "../../src/libnr/nr-types-test.h", 8, "NrTypesTest", Tests_NrTypesTest, suite_NrTypesTest, 23, 24 );
344 +CxxTest::DynamicSuiteDescription<NrTypesTest> suiteDescription_NrTypesTest( "libnr/nr-types-test.h", 8, "NrTypesTest", Tests_NrTypesTest, suite_NrTypesTest, 23, 24 );
346 static class TestDescription_NrTypesTest_testXYValues : public CxxTest::RealTestDescription {
347 public:
348 @@ -843,12 +843,12 @@ public:
349 void runTest() { if ( suite_NrTypesTest ) suite_NrTypesTest->testNormalize(); }
350 } testDescription_NrTypesTest_testNormalize;
352 -#include "../../src/svg/css-ostringstream-test.h"
353 +#include "svg/css-ostringstream-test.h"
355 static CSSOStringStreamTest *suite_CSSOStringStreamTest = 0;
357 static CxxTest::List Tests_CSSOStringStreamTest = { 0, 0 };
358 -CxxTest::DynamicSuiteDescription<CSSOStringStreamTest> suiteDescription_CSSOStringStreamTest( "../../src/svg/css-ostringstream-test.h", 20, "CSSOStringStreamTest", Tests_CSSOStringStreamTest, suite_CSSOStringStreamTest, 26, 27 );
359 +CxxTest::DynamicSuiteDescription<CSSOStringStreamTest> suiteDescription_CSSOStringStreamTest( "svg/css-ostringstream-test.h", 20, "CSSOStringStreamTest", Tests_CSSOStringStreamTest, suite_CSSOStringStreamTest, 26, 27 );
361 static class TestDescription_CSSOStringStreamTest_testFloats : public CxxTest::RealTestDescription {
362 public:
363 @@ -868,12 +868,12 @@ public:
364 void runTest() { if ( suite_CSSOStringStreamTest ) suite_CSSOStringStreamTest->testConcat(); }
365 } testDescription_CSSOStringStreamTest_testConcat;
367 -#include "../../src/svg/stringstream-test.h"
368 +#include "svg/stringstream-test.h"
370 static StringStreamTest *suite_StringStreamTest = 0;
372 static CxxTest::List Tests_StringStreamTest = { 0, 0 };
373 -CxxTest::DynamicSuiteDescription<StringStreamTest> suiteDescription_StringStreamTest( "../../src/svg/stringstream-test.h", 21, "StringStreamTest", Tests_StringStreamTest, suite_StringStreamTest, 27, 28 );
374 +CxxTest::DynamicSuiteDescription<StringStreamTest> suiteDescription_StringStreamTest( "svg/stringstream-test.h", 21, "StringStreamTest", Tests_StringStreamTest, suite_StringStreamTest, 27, 28 );
376 static class TestDescription_StringStreamTest_testFloats : public CxxTest::RealTestDescription {
377 public:
378 @@ -893,12 +893,12 @@ public:
379 void runTest() { if ( suite_StringStreamTest ) suite_StringStreamTest->testConcat(); }
380 } testDescription_StringStreamTest_testConcat;
382 -#include "../../src/svg/svg-affine-test.h"
383 +#include "svg/svg-affine-test.h"
385 static SvgAffineTest *suite_SvgAffineTest = 0;
387 static CxxTest::List Tests_SvgAffineTest = { 0, 0 };
388 -CxxTest::DynamicSuiteDescription<SvgAffineTest> suiteDescription_SvgAffineTest( "../../src/svg/svg-affine-test.h", 12, "SvgAffineTest", Tests_SvgAffineTest, suite_SvgAffineTest, 46, 47 );
389 +CxxTest::DynamicSuiteDescription<SvgAffineTest> suiteDescription_SvgAffineTest( "svg/svg-affine-test.h", 12, "SvgAffineTest", Tests_SvgAffineTest, suite_SvgAffineTest, 46, 47 );
391 static class TestDescription_SvgAffineTest_testReadIdentity : public CxxTest::RealTestDescription {
392 public:
393 @@ -984,12 +984,12 @@ public:
394 void runTest() { if ( suite_SvgAffineTest ) suite_SvgAffineTest->testReadFailures(); }
395 } testDescription_SvgAffineTest_testReadFailures;
397 -#include "../../src/svg/svg-color-test.h"
398 +#include "svg/svg-color-test.h"
400 static SVGColorTest *suite_SVGColorTest = 0;
402 static CxxTest::List Tests_SVGColorTest = { 0, 0 };
403 -CxxTest::DynamicSuiteDescription<SVGColorTest> suiteDescription_SVGColorTest( "../../src/svg/svg-color-test.h", 9, "SVGColorTest", Tests_SVGColorTest, suite_SVGColorTest, 35, 36 );
404 +CxxTest::DynamicSuiteDescription<SVGColorTest> suiteDescription_SVGColorTest( "svg/svg-color-test.h", 9, "SVGColorTest", Tests_SVGColorTest, suite_SVGColorTest, 35, 36 );
406 static class TestDescription_SVGColorTest_testWrite : public CxxTest::RealTestDescription {
407 public:
408 @@ -1009,12 +1009,12 @@ public:
409 void runTest() { if ( suite_SVGColorTest ) suite_SVGColorTest->testIccColor(); }
410 } testDescription_SVGColorTest_testIccColor;
412 -#include "../../src/svg/svg-length-test.h"
413 +#include "svg/svg-length-test.h"
415 static SvgLengthTest *suite_SvgLengthTest = 0;
417 static CxxTest::List Tests_SvgLengthTest = { 0, 0 };
418 -CxxTest::DynamicSuiteDescription<SvgLengthTest> suiteDescription_SvgLengthTest( "../../src/svg/svg-length-test.h", 10, "SvgLengthTest", Tests_SvgLengthTest, suite_SvgLengthTest, 29, 30 );
419 +CxxTest::DynamicSuiteDescription<SvgLengthTest> suiteDescription_SvgLengthTest( "svg/svg-length-test.h", 10, "SvgLengthTest", Tests_SvgLengthTest, suite_SvgLengthTest, 29, 30 );
421 static class TestDescription_SvgLengthTest_testRead : public CxxTest::RealTestDescription {
422 public:
423 @@ -1058,12 +1058,12 @@ public:
424 void runTest() { if ( suite_SvgLengthTest ) suite_SvgLengthTest->testPlaces(); }
425 } testDescription_SvgLengthTest_testPlaces;
427 -#include "../../src/svg/svg-path-geom-test.h"
428 +#include "svg/svg-path-geom-test.h"
430 static SvgPathGeomTest *suite_SvgPathGeomTest = 0;
432 static CxxTest::List Tests_SvgPathGeomTest = { 0, 0 };
433 -CxxTest::DynamicSuiteDescription<SvgPathGeomTest> suiteDescription_SvgPathGeomTest( "../../src/svg/svg-path-geom-test.h", 13, "SvgPathGeomTest", Tests_SvgPathGeomTest, suite_SvgPathGeomTest, 69, 70 );
434 +CxxTest::DynamicSuiteDescription<SvgPathGeomTest> suiteDescription_SvgPathGeomTest( "svg/svg-path-geom-test.h", 13, "SvgPathGeomTest", Tests_SvgPathGeomTest, suite_SvgPathGeomTest, 69, 70 );
436 static class TestDescription_SvgPathGeomTest_testReadRectanglesAbsoluteClosed : public CxxTest::RealTestDescription {
437 public:
438 @@ -1179,12 +1179,12 @@ public:
439 void runTest() { if ( suite_SvgPathGeomTest ) suite_SvgPathGeomTest->testMinexpPrecision(); }
440 } testDescription_SvgPathGeomTest_testMinexpPrecision;
442 -#include "../../src/xml/repr-action-test.h"
443 +#include "xml/repr-action-test.h"
445 static XmlReprActionTest *suite_XmlReprActionTest = 0;
447 static CxxTest::List Tests_XmlReprActionTest = { 0, 0 };
448 -CxxTest::DynamicSuiteDescription<XmlReprActionTest> suiteDescription_XmlReprActionTest( "../../src/xml/repr-action-test.h", 11, "XmlReprActionTest", Tests_XmlReprActionTest, suite_XmlReprActionTest, 33, 34 );
449 +CxxTest::DynamicSuiteDescription<XmlReprActionTest> suiteDescription_XmlReprActionTest( "xml/repr-action-test.h", 11, "XmlReprActionTest", Tests_XmlReprActionTest, suite_XmlReprActionTest, 33, 34 );
451 static class TestDescription_XmlReprActionTest_testRollbackOfNodeAddition : public CxxTest::RealTestDescription {
452 public:
453 @@ -1204,12 +1204,12 @@ public:
454 void runTest() { if ( suite_XmlReprActionTest ) suite_XmlReprActionTest->testRollbackOfNodeReordering(); }
455 } testDescription_XmlReprActionTest_testRollbackOfNodeReordering;
457 -#include "../../src/xml/quote-test.h"
458 +#include "xml/quote-test.h"
460 static XmlQuoteTest *suite_XmlQuoteTest = 0;
462 static CxxTest::List Tests_XmlQuoteTest = { 0, 0 };
463 -CxxTest::DynamicSuiteDescription<XmlQuoteTest> suiteDescription_XmlQuoteTest( "../../src/xml/quote-test.h", 15, "XmlQuoteTest", Tests_XmlQuoteTest, suite_XmlQuoteTest, 26, 27 );
464 +CxxTest::DynamicSuiteDescription<XmlQuoteTest> suiteDescription_XmlQuoteTest( "xml/quote-test.h", 15, "XmlQuoteTest", Tests_XmlQuoteTest, suite_XmlQuoteTest, 26, 27 );
466 static class TestDescription_XmlQuoteTest_testXmlQuotedStrlen : public CxxTest::RealTestDescription {
467 public:
468 @@ -1223,12 +1223,12 @@ public:
469 void runTest() { if ( suite_XmlQuoteTest ) suite_XmlQuoteTest->testXmlQuoteStrdup(); }
470 } testDescription_XmlQuoteTest_testXmlQuoteStrdup;
472 -#include "../../src/util/list-container-test.h"
473 +#include "util/list-container-test.h"
475 static ListContainerTest *suite_ListContainerTest = 0;
477 static CxxTest::List Tests_ListContainerTest = { 0, 0 };
478 -CxxTest::DynamicSuiteDescription<ListContainerTest> suiteDescription_ListContainerTest( "../../src/util/list-container-test.h", 28, "ListContainerTest", Tests_ListContainerTest, suite_ListContainerTest, 38, 39 );
479 +CxxTest::DynamicSuiteDescription<ListContainerTest> suiteDescription_ListContainerTest( "util/list-container-test.h", 28, "ListContainerTest", Tests_ListContainerTest, suite_ListContainerTest, 38, 39 );
481 static class TestDescription_ListContainerTest_testRangeConstructor : public CxxTest::RealTestDescription {
482 public: