claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug where test would fail if libFLAC not built with ogg support

Browse Source
This commit is contained in:
Josh Coalson
2006-11-21 06:39:14 +00:00
parent 2beca73003
commit a196a66309
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/test_libFLAC++/metadata_manip.cpp
View File

@@ -2192,15 +2192,17 @@ bool test_metadata_file_manipulation()
if(!test_level_2_misc_(/*is_ogg=*/false)) if(!test_level_2_misc_(/*is_ogg=*/false))
return false; return false;
if(!test_level_2_(/*filename_based=*/true, /*is_ogg=*/true)) /* filename-based */ if(FLAC_API_SUPPORTS_OGG_FLAC) {
return false; if(!test_level_2_(/*filename_based=*/true, /*is_ogg=*/true)) /* filename-based */
if(!test_level_2_(/*filename_based=*/false, /*is_ogg=*/true)) /* callback-based */ return false;
return false; if(!test_level_2_(/*filename_based=*/false, /*is_ogg=*/true)) /* callback-based */
return false;
#if 0 #if 0
/* when ogg flac write is supported, will have to add this: */ /* when ogg flac write is supported, will have to add this: */
if(!test_level_2_misc_(/*is_ogg=*/true)) if(!test_level_2_misc_(/*is_ogg=*/true))
return false; return false;
#endif #endif
}
return true; return true;
} }

17
src/test_libFLAC/metadata_manip.c
View File

@@ -22,6 +22,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> /* for malloc() */ #include <stdlib.h> /* for malloc() */
#include <string.h> /* for memcpy()/memset() */
#if defined _MSC_VER || defined __MINGW32__ #if defined _MSC_VER || defined __MINGW32__
#include <sys/utime.h> /* for utime() */ #include <sys/utime.h> /* for utime() */
#include <io.h> /* for chmod() */ #include <io.h> /* for chmod() */
@@ -2111,15 +2112,17 @@ FLAC__bool test_metadata_file_manipulation()
if(!test_level_2_misc_(/*is_ogg=*/false)) if(!test_level_2_misc_(/*is_ogg=*/false))
return false; return false;
if(!test_level_2_(/*filename_based=*/true, /*is_ogg=*/true)) /* filename-based */ if(FLAC_API_SUPPORTS_OGG_FLAC) {
return false; if(!test_level_2_(/*filename_based=*/true, /*is_ogg=*/true)) /* filename-based */
if(!test_level_2_(/*filename_based=*/false, /*is_ogg=*/true)) /* callback-based */ return false;
return false; if(!test_level_2_(/*filename_based=*/false, /*is_ogg=*/true)) /* callback-based */
return false;
#if 0 #if 0
/* when ogg flac write is supported, will have to add this: */ /* when ogg flac write is supported, will have to add this: */
if(!test_level_2_misc_(/*is_ogg=*/true)) if(!test_level_2_misc_(/*is_ogg=*/true))
return false; return false;
#endif #endif
}
return true; return true;
} }