Adapted to Corrade changes.

Optimalizations in Corrade::TestSuite and Corrade::Utility::Debug leaded to significant reduction of compilation time - on my machine it was ~5:38 before with building of unit tests enabled, now only ~5:00.
14 years ago · ae013effff
56 changed files with 57 additions and 52 deletions
--- a/src/AbstractImage.cpp
+++ b/src/AbstractImage.cpp
@ -15,7 +15,7 @@

 #include "AbstractImage.h"

-#include <Utility/Debug.h>
+#include <Utility/Assert.h>

 #include "TypeTraits.h"

--- a/src/Implementation/BufferState.cpp
+++ b/src/Implementation/BufferState.cpp
@ -15,7 +15,7 @@

 #include "BufferState.h"

-#include <Utility/Debug.h>
+#include <Utility/Assert.h>

 namespace Magnum { namespace Implementation {

--- a/src/Math/Algorithms/Test/GaussJordanTest.h
+++ b/src/Math/Algorithms/Test/GaussJordanTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Math { namespace Algorithms { namespace Test {

-class GaussJordanTest: public Corrade::TestSuite::Tester<GaussJordanTest> {
+class GaussJordanTest: public Corrade::TestSuite::Tester {
    public:
        GaussJordanTest();

--- a/src/Math/Geometry/Test/DistanceTest.h
+++ b/src/Math/Geometry/Test/DistanceTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Math { namespace Geometry { namespace Test {

-class DistanceTest: public Corrade::TestSuite::Tester<DistanceTest> {
+class DistanceTest: public Corrade::TestSuite::Tester {
    public:
        DistanceTest();

--- a/src/Math/Geometry/Test/IntersectionTest.h
+++ b/src/Math/Geometry/Test/IntersectionTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Math { namespace Geometry { namespace Test {

-class IntersectionTest: public Corrade::TestSuite::Tester<IntersectionTest> {
+class IntersectionTest: public Corrade::TestSuite::Tester {
    public:
        IntersectionTest();

--- a/src/Math/Test/ConstantsTest.h
+++ b/src/Math/Test/ConstantsTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Math { namespace Test {

-class ConstantsTest: public Corrade::TestSuite::Tester<ConstantsTest> {
+class ConstantsTest: public Corrade::TestSuite::Tester {
    public:
        ConstantsTest();

--- a/src/Math/Test/MathTest.h
+++ b/src/Math/Test/MathTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Math { namespace Test {

-class MathTest: public Corrade::TestSuite::Tester<MathTest> {
+class MathTest: public Corrade::TestSuite::Tester {
    public:
        MathTest();

--- a/src/Math/Test/MathTypeTraitsTest.h
+++ b/src/Math/Test/MathTypeTraitsTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Math { namespace Test {

-class MathTypeTraitsTest: public Corrade::TestSuite::Tester<MathTypeTraitsTest> {
+class MathTypeTraitsTest: public Corrade::TestSuite::Tester {
    public:
        MathTypeTraitsTest();

--- a/src/Math/Test/Matrix3Test.h
+++ b/src/Math/Test/Matrix3Test.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Math { namespace Test {

-class Matrix3Test: public Corrade::TestSuite::Tester<Matrix3Test> {
+class Matrix3Test: public Corrade::TestSuite::Tester {
    public:
        Matrix3Test();

--- a/src/Math/Test/Matrix4Test.h
+++ b/src/Math/Test/Matrix4Test.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Math { namespace Test {

-class Matrix4Test: public Corrade::TestSuite::Tester<Matrix4Test> {
+class Matrix4Test: public Corrade::TestSuite::Tester {
    public:
        Matrix4Test();

--- a/src/Math/Test/MatrixTest.h
+++ b/src/Math/Test/MatrixTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Math { namespace Test {

-class MatrixTest: public Corrade::TestSuite::Tester<MatrixTest> {
+class MatrixTest: public Corrade::TestSuite::Tester {
    public:
        MatrixTest();

--- a/src/Math/Test/Point2DTest.h
+++ b/src/Math/Test/Point2DTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Math { namespace Test {

-class Point2DTest: public Corrade::TestSuite::Tester<Point2DTest> {
+class Point2DTest: public Corrade::TestSuite::Tester {
    public:
        Point2DTest();

--- a/src/Math/Test/Point3DTest.h
+++ b/src/Math/Test/Point3DTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Math { namespace Test {

-class Point3DTest: public Corrade::TestSuite::Tester<Point3DTest> {
+class Point3DTest: public Corrade::TestSuite::Tester {
    public:
        Point3DTest();

--- a/src/Math/Test/RectangularMatrixTest.h
+++ b/src/Math/Test/RectangularMatrixTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Math { namespace Test {

-class RectangularMatrixTest: public Corrade::TestSuite::Tester<RectangularMatrixTest> {
+class RectangularMatrixTest: public Corrade::TestSuite::Tester {
    public:
        RectangularMatrixTest();

--- a/src/Math/Test/Vector2Test.h
+++ b/src/Math/Test/Vector2Test.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Math { namespace Test {

-class Vector2Test: public Corrade::TestSuite::Tester<Vector2Test> {
+class Vector2Test: public Corrade::TestSuite::Tester {
    public:
        Vector2Test();

--- a/src/Math/Test/Vector3Test.h
+++ b/src/Math/Test/Vector3Test.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Math { namespace Test {

-class Vector3Test: public Corrade::TestSuite::Tester<Vector3Test> {
+class Vector3Test: public Corrade::TestSuite::Tester {
    public:
        Vector3Test();

--- a/src/Math/Test/Vector4Test.h
+++ b/src/Math/Test/Vector4Test.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Math { namespace Test {

-class Vector4Test: public Corrade::TestSuite::Tester<Vector4Test> {
+class Vector4Test: public Corrade::TestSuite::Tester {
    public:
        Vector4Test();

--- a/src/Math/Test/VectorTest.h
+++ b/src/Math/Test/VectorTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Math { namespace Test {

-class VectorTest: public Corrade::TestSuite::Tester<VectorTest> {
+class VectorTest: public Corrade::TestSuite::Tester {
    public:
        VectorTest();

--- a/src/Math/Vector.h
+++ b/src/Math/Vector.h
@ -19,6 +19,8 @@
 * @brief Class Magnum::Math::Vector
 */

+#include <Utility/Assert.h>
+
 #include "RectangularMatrix.h"

 namespace Magnum { namespace Math {
--- a/src/Mesh.h
+++ b/src/Mesh.h
@ -20,7 +20,7 @@
 */

 #include <vector>
-#include <Utility/Debug.h>
+#include <Utility/Assert.h>

 #include "AbstractShaderProgram.h"
 #include "TypeTraits.h"
--- a/src/MeshTools/Test/CleanTest.h
+++ b/src/MeshTools/Test/CleanTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace MeshTools { namespace Test {

-class CleanTest: public Corrade::TestSuite::Tester<CleanTest> {
+class CleanTest: public Corrade::TestSuite::Tester {
    public:
        CleanTest();

--- a/src/MeshTools/Test/CombineIndexedArraysTest.h
+++ b/src/MeshTools/Test/CombineIndexedArraysTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace MeshTools { namespace Test {

-class CombineIndexedArraysTest: public Corrade::TestSuite::Tester<CombineIndexedArraysTest> {
+class CombineIndexedArraysTest: public Corrade::TestSuite::Tester {
    public:
        CombineIndexedArraysTest();

--- a/src/MeshTools/Test/CompressIndicesTest.h
+++ b/src/MeshTools/Test/CompressIndicesTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace MeshTools { namespace Test {

-class CompressIndicesTest: public Corrade::TestSuite::Tester<CompressIndicesTest> {
+class CompressIndicesTest: public Corrade::TestSuite::Tester {
    public:
        CompressIndicesTest();

--- a/src/MeshTools/Test/FlipNormalsTest.h
+++ b/src/MeshTools/Test/FlipNormalsTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace MeshTools { namespace Test {

-class FlipNormalsTest: public Corrade::TestSuite::Tester<FlipNormalsTest> {
+class FlipNormalsTest: public Corrade::TestSuite::Tester {
    public:
        FlipNormalsTest();

--- a/src/MeshTools/Test/GenerateFlatNormalsTest.h
+++ b/src/MeshTools/Test/GenerateFlatNormalsTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace MeshTools { namespace Test {

-class GenerateFlatNormalsTest: public Corrade::TestSuite::Tester<GenerateFlatNormalsTest> {
+class GenerateFlatNormalsTest: public Corrade::TestSuite::Tester {
    public:
        GenerateFlatNormalsTest();

--- a/src/MeshTools/Test/InterleaveTest.h
+++ b/src/MeshTools/Test/InterleaveTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace MeshTools { namespace Test {

-class InterleaveTest: public Corrade::TestSuite::Tester<InterleaveTest> {
+class InterleaveTest: public Corrade::TestSuite::Tester {
    public:
        InterleaveTest();

--- a/src/MeshTools/Test/SubdivideTest.h
+++ b/src/MeshTools/Test/SubdivideTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace MeshTools { namespace Test {

-class SubdivideTest: public Corrade::TestSuite::Tester<SubdivideTest> {
+class SubdivideTest: public Corrade::TestSuite::Tester {
    public:
        SubdivideTest();

--- a/src/MeshTools/Test/TipsifyTest.h
+++ b/src/MeshTools/Test/TipsifyTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace MeshTools { namespace Test {

-class TipsifyTest: public Corrade::TestSuite::Tester<TipsifyTest> {
+class TipsifyTest: public Corrade::TestSuite::Tester {
    public:
        TipsifyTest();

--- a/src/Physics/ShapeGroup.h
+++ b/src/Physics/ShapeGroup.h
@ -21,6 +21,7 @@

 #include "AbstractShape.h"

+#include <functional>
 #include <type_traits>
 #include <utility>

--- a/src/Physics/Test/AbstractShapeTest.h
+++ b/src/Physics/Test/AbstractShapeTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Physics { namespace Test {

-class AbstractShapeTest: public Corrade::TestSuite::Tester<AbstractShapeTest> {
+class AbstractShapeTest: public Corrade::TestSuite::Tester {
    public:
        AbstractShapeTest();

--- a/src/Physics/Test/AxisAlignedBoxTest.h
+++ b/src/Physics/Test/AxisAlignedBoxTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Physics { namespace Test {

-class AxisAlignedBoxTest: public Corrade::TestSuite::Tester<AxisAlignedBoxTest> {
+class AxisAlignedBoxTest: public Corrade::TestSuite::Tester {
    public:
        AxisAlignedBoxTest();

--- a/src/Physics/Test/BoxTest.h
+++ b/src/Physics/Test/BoxTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Physics { namespace Test {

-class BoxTest: public Corrade::TestSuite::Tester<BoxTest> {
+class BoxTest: public Corrade::TestSuite::Tester {
    public:
        BoxTest();

--- a/src/Physics/Test/CapsuleTest.h
+++ b/src/Physics/Test/CapsuleTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Physics { namespace Test {

-class CapsuleTest: public Corrade::TestSuite::Tester<CapsuleTest>, ShapeTestBase {
+class CapsuleTest: public Corrade::TestSuite::Tester, ShapeTestBase {
    public:
        CapsuleTest();

--- a/src/Physics/Test/LineTest.h
+++ b/src/Physics/Test/LineTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Physics { namespace Test {

-class LineTest: public Corrade::TestSuite::Tester<LineTest> {
+class LineTest: public Corrade::TestSuite::Tester {
    public:
        LineTest();

--- a/src/Physics/Test/ObjectShapeTest.h
+++ b/src/Physics/Test/ObjectShapeTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Physics { namespace Test {

-class ObjectShapeTest: public Corrade::TestSuite::Tester<ObjectShapeTest> {
+class ObjectShapeTest: public Corrade::TestSuite::Tester {
    public:
        ObjectShapeTest();

--- a/src/Physics/Test/PlaneTest.h
+++ b/src/Physics/Test/PlaneTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Physics { namespace Test {

-class PlaneTest: public Corrade::TestSuite::Tester<PlaneTest>, ShapeTestBase {
+class PlaneTest: public Corrade::TestSuite::Tester, ShapeTestBase {
    public:
        PlaneTest();

--- a/src/Physics/Test/PointTest.h
+++ b/src/Physics/Test/PointTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Physics { namespace Test {

-class PointTest: public Corrade::TestSuite::Tester<PointTest> {
+class PointTest: public Corrade::TestSuite::Tester {
    public:
        PointTest();

--- a/src/Physics/Test/ShapeGroupTest.h
+++ b/src/Physics/Test/ShapeGroupTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Physics { namespace Test {

-class ShapeGroupTest: public Corrade::TestSuite::Tester<ShapeGroupTest> {
+class ShapeGroupTest: public Corrade::TestSuite::Tester {
    public:
        ShapeGroupTest();

--- a/src/Physics/Test/SphereTest.h
+++ b/src/Physics/Test/SphereTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Physics { namespace Test {

-class SphereTest: public Corrade::TestSuite::Tester<SphereTest>, ShapeTestBase {
+class SphereTest: public Corrade::TestSuite::Tester, ShapeTestBase {
    public:
        SphereTest();

--- a/src/Platform/ExtensionWrangler.cpp
+++ b/src/Platform/ExtensionWrangler.cpp
@ -15,6 +15,7 @@

 #include "ExtensionWrangler.h"

+#include <cstdlib>
 #include <Utility/Debug.h>

 #include "Magnum.h"
--- a/src/Primitives/Test/CapsuleTest.h
+++ b/src/Primitives/Test/CapsuleTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Primitives { namespace Test {

-class CapsuleTest: public Corrade::TestSuite::Tester<CapsuleTest> {
+class CapsuleTest: public Corrade::TestSuite::Tester {
    public:
        CapsuleTest();

--- a/src/Primitives/Test/CylinderTest.h
+++ b/src/Primitives/Test/CylinderTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Primitives { namespace Test {

-class CylinderTest: public Corrade::TestSuite::Tester<CylinderTest> {
+class CylinderTest: public Corrade::TestSuite::Tester {
    public:
        CylinderTest();

--- a/src/Primitives/Test/UVSphereTest.h
+++ b/src/Primitives/Test/UVSphereTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Primitives { namespace Test {

-class UVSphereTest: public Corrade::TestSuite::Tester<UVSphereTest> {
+class UVSphereTest: public Corrade::TestSuite::Tester {
    public:
        UVSphereTest();

--- a/src/Profiler.cpp
+++ b/src/Profiler.cpp
@ -17,7 +17,7 @@

 #include <algorithm>
 #include <numeric>
-#include <Utility/Debug.h>
+#include <Utility/Assert.h>

 using namespace std;

--- a/src/Resource.h
+++ b/src/Resource.h
@ -19,6 +19,7 @@
 * @brief Class Magnum::ResourceKey, Magnum::Resource, enum Magnum::ResourceState
 */

+#include <Utility/Assert.h>
 #include <Utility/MurmurHash2.h>

 #include "Magnum.h"
--- a/src/SceneGraph/FeatureGroup.h
+++ b/src/SceneGraph/FeatureGroup.h
@ -21,7 +21,7 @@

 #include <algorithm>
 #include <vector>
-#include <Utility/Debug.h>
+#include <Utility/Assert.h>

 #include "SceneGraph.h"

--- a/src/SceneGraph/Test/CameraTest.h
+++ b/src/SceneGraph/Test/CameraTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace SceneGraph { namespace Test {

-class CameraTest: public Corrade::TestSuite::Tester<CameraTest> {
+class CameraTest: public Corrade::TestSuite::Tester {
    public:
        CameraTest();

--- a/src/SceneGraph/Test/ObjectTest.h
+++ b/src/SceneGraph/Test/ObjectTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace SceneGraph { namespace Test {

-class ObjectTest: public Corrade::TestSuite::Tester<ObjectTest> {
+class ObjectTest: public Corrade::TestSuite::Tester {
    public:
        ObjectTest();

--- a/src/SceneGraph/Test/SceneTest.h
+++ b/src/SceneGraph/Test/SceneTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace SceneGraph { namespace Test {

-class SceneTest: public Corrade::TestSuite::Tester<SceneTest> {
+class SceneTest: public Corrade::TestSuite::Tester {
    public:
        SceneTest();

--- a/src/Shader.cpp
+++ b/src/Shader.cpp
@ -16,7 +16,7 @@
 #include "Shader.h"

 #include <fstream>
-#include <Utility/Debug.h>
+#include <Utility/Assert.h>

 #define COMPILER_MESSAGE_MAX_LENGTH 1024

--- a/src/Test/ArrayTest.h
+++ b/src/Test/ArrayTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Test {

-class ArrayTest: public Corrade::TestSuite::Tester<ArrayTest> {
+class ArrayTest: public Corrade::TestSuite::Tester {
    public:
        ArrayTest();

--- a/src/Test/ColorTest.h
+++ b/src/Test/ColorTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Test {

-class ColorTest: public Corrade::TestSuite::Tester<ColorTest> {
+class ColorTest: public Corrade::TestSuite::Tester {
    public:
        ColorTest();

--- a/src/Test/MeshTest.h
+++ b/src/Test/MeshTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Test {

-class MeshTest: public Corrade::TestSuite::Tester<MeshTest> {
+class MeshTest: public Corrade::TestSuite::Tester {
    public:
        MeshTest();

--- a/src/Test/ResourceManagerTest.h
+++ b/src/Test/ResourceManagerTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Test {

-class ResourceManagerTest: public Corrade::TestSuite::Tester<ResourceManagerTest> {
+class ResourceManagerTest: public Corrade::TestSuite::Tester {
    public:
        ResourceManagerTest();

--- a/src/Test/SwizzleTest.h
+++ b/src/Test/SwizzleTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Test {

-class SwizzleTest: public Corrade::TestSuite::Tester<SwizzleTest> {
+class SwizzleTest: public Corrade::TestSuite::Tester {
    public:
        SwizzleTest();

--- a/src/Test/TypeTraitsTest.h
+++ b/src/Test/TypeTraitsTest.h
@ -19,7 +19,7 @@

 namespace Magnum { namespace Test {

-class TypeTraitsTest: public Corrade::TestSuite::Tester<TypeTraitsTest> {
+class TypeTraitsTest: public Corrade::TestSuite::Tester {
    public:
        TypeTraitsTest();