Remove the options to disable MP4/ASF support

This commit is contained in:
Lukáš Lalinský
2011-06-24 08:49:50 +02:00
parent 0b34d4f8ee
commit dd846904cb
18 changed files with 18 additions and 93 deletions

View File

@ -47,18 +47,11 @@ SET(test_runner_SRCS
test_apetag.cpp
test_wav.cpp
test_wavpack.cpp
test_mp4.cpp
test_mp4item.cpp
test_mp4coverart.cpp
test_asf.cpp
)
IF(WITH_MP4)
SET(test_runner_SRCS ${test_runner_SRCS}
test_mp4.cpp
test_mp4item.cpp
test_mp4coverart.cpp
)
ENDIF(WITH_MP4)
IF(WITH_ASF)
SET(test_runner_SRCS ${test_runner_SRCS} test_asf.cpp)
ENDIF(WITH_ASF)
ADD_EXECUTABLE(test_runner ${test_runner_SRCS})
TARGET_LINK_LIBRARIES(test_runner tag ${CPPUNIT_LIBRARIES})

View File

@ -16,9 +16,7 @@ using namespace TagLib;
class TestFileRef : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE(TestFileRef);
#ifdef TAGLIB_WITH_ASF
CPPUNIT_TEST(testASF);
#endif
CPPUNIT_TEST(testMusepack);
CPPUNIT_TEST(testVorbis);
CPPUNIT_TEST(testSpeex);
@ -26,11 +24,9 @@ class TestFileRef : public CppUnit::TestFixture
CPPUNIT_TEST(testMP3);
CPPUNIT_TEST(testOGA_FLAC);
CPPUNIT_TEST(testOGA_Vorbis);
#ifdef TAGLIB_WITH_MP4
CPPUNIT_TEST(testMP4_1);
CPPUNIT_TEST(testMP4_2);
CPPUNIT_TEST(testMP4_3);
#endif
CPPUNIT_TEST(testTrueAudio);
CPPUNIT_TEST(testAPE);
CPPUNIT_TEST_SUITE_END();
@ -86,12 +82,10 @@ public:
fileRefSave("click", ".mpc");
}
#ifdef TAGLIB_WITH_ASF
void testASF()
{
fileRefSave("silence-1", ".wma");
}
#endif
void testVorbis()
{
@ -118,7 +112,6 @@ public:
fileRefSave("empty", ".tta");
}
#ifdef TAGLIB_WITH_MP4
void testMP4_1()
{
fileRefSave("has-tags", ".m4a");
@ -133,7 +126,6 @@ public:
{
fileRefSave("no-tags", ".3g2");
}
#endif
void testOGA_FLAC()
{