aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-03-15 10:00:07 +0100
committerMax Kellermann <max@duempel.org>2014-03-15 10:00:47 +0100
commit40cce050e7f6105320c5d7ab1e061b343c186ceb (patch)
tree98bda7940ff19baaa6b6068485a8122942745042
parentbb6ee71f08478cc3c82883bcefe1f97368bd7c90 (diff)
downloadmpd-40cce050e7f6105320c5d7ab1e061b343c186ceb.tar.gz
mpd-40cce050e7f6105320c5d7ab1e061b343c186ceb.tar.xz
mpd-40cce050e7f6105320c5d7ab1e061b343c186ceb.zip
test/test_pcm_all: move CPPUNIT_TEST_SUITE_REGISTRATION() to test_pcm_main.cxx
Run each unit test only once. Using CPPUNIT_TEST_SUITE_REGISTRATION from within the header meant that each unit class was registered again for each source file that includes the header.
Diffstat (limited to '')
-rw-r--r--test/test_pcm_all.hxx12
-rw-r--r--test/test_pcm_main.cxx7
2 files changed, 7 insertions, 12 deletions
diff --git a/test/test_pcm_all.hxx b/test/test_pcm_all.hxx
index 09f25f70c..1c7df82eb 100644
--- a/test/test_pcm_all.hxx
+++ b/test/test_pcm_all.hxx
@@ -34,8 +34,6 @@ public:
void TestDither32();
};
-CPPUNIT_TEST_SUITE_REGISTRATION(PcmDitherTest);
-
class PcmPackTest : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE(PcmPackTest);
CPPUNIT_TEST(TestPack24);
@@ -47,8 +45,6 @@ public:
void TestUnpack24();
};
-CPPUNIT_TEST_SUITE_REGISTRATION(PcmPackTest);
-
class PcmChannelsTest : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE(PcmChannelsTest);
CPPUNIT_TEST(TestChannels16);
@@ -60,8 +56,6 @@ public:
void TestChannels32();
};
-CPPUNIT_TEST_SUITE_REGISTRATION(PcmChannelsTest);
-
class PcmVolumeTest : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE(PcmVolumeTest);
CPPUNIT_TEST(TestVolume8);
@@ -79,8 +73,6 @@ public:
void TestVolumeFloat();
};
-CPPUNIT_TEST_SUITE_REGISTRATION(PcmVolumeTest);
-
class PcmFormatTest : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE(PcmFormatTest);
CPPUNIT_TEST(TestFormat8to16);
@@ -96,8 +88,6 @@ public:
void TestFormatFloat();
};
-CPPUNIT_TEST_SUITE_REGISTRATION(PcmFormatTest);
-
class PcmMixTest : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE(PcmMixTest);
CPPUNIT_TEST(TestMix8);
@@ -113,6 +103,4 @@ public:
void TestMix32();
};
-CPPUNIT_TEST_SUITE_REGISTRATION(PcmMixTest);
-
#endif
diff --git a/test/test_pcm_main.cxx b/test/test_pcm_main.cxx
index 0d6d2fef3..0803e64f5 100644
--- a/test/test_pcm_main.cxx
+++ b/test/test_pcm_main.cxx
@@ -25,6 +25,13 @@
#include <stdlib.h>
+CPPUNIT_TEST_SUITE_REGISTRATION(PcmDitherTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(PcmPackTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(PcmChannelsTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(PcmVolumeTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(PcmFormatTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(PcmMixTest);
+
int
main(gcc_unused int argc, gcc_unused char **argv)
{