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 cursheet tests for 'make distcheck'.

Browse Source
This commit is contained in:
Erik de Castro Lopo
2015-02-23 19:42:30 +11:00
parent 8267168d28
commit 29db3fbf1c
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/test_grabbag/cuesheet/main.c
View File

@@ -32,7 +32,7 @@
static int do_cuesheet(const char *infilename, unsigned sample_rate, FLAC__bool is_cdda, FLAC__uint64 lead_out_offset) static int do_cuesheet(const char *infilename, unsigned sample_rate, FLAC__bool is_cdda, FLAC__uint64 lead_out_offset)
{ {
FILE *fin, *fout; FILE *fin, *fout;
const char *error_message; const char *error_message, *tmpfilenamebase;
char tmpfilename[4096]; char tmpfilename[4096];
unsigned last_line_read; unsigned last_line_read;
FLAC__StreamMetadata *cuesheet; FLAC__StreamMetadata *cuesheet;
@@ -64,7 +64,11 @@ static int do_cuesheet(const char *infilename, unsigned sample_rate, FLAC__bool
FLAC__metadata_object_delete(cuesheet); FLAC__metadata_object_delete(cuesheet);
return 1; return 1;
} }
flac_snprintf(tmpfilename, sizeof (tmpfilename), "%s.1", infilename);
tmpfilenamebase = strstr(infilename, "cuesheets/");
tmpfilenamebase = tmpfilenamebase == NULL ? infilename : tmpfilenamebase;
flac_snprintf(tmpfilename, sizeof (tmpfilename), "%s.1", tmpfilenamebase);
if(0 == (fout = flac_fopen(tmpfilename, "w"))) { if(0 == (fout = flac_fopen(tmpfilename, "w"))) {
fprintf(stderr, "can't open file %s for writing: %s\n", tmpfilename, strerror(errno)); fprintf(stderr, "can't open file %s for writing: %s\n", tmpfilename, strerror(errno));
FLAC__metadata_object_delete(cuesheet); FLAC__metadata_object_delete(cuesheet);
@@ -96,7 +100,7 @@ static int do_cuesheet(const char *infilename, unsigned sample_rate, FLAC__bool
FLAC__metadata_object_delete(cuesheet); FLAC__metadata_object_delete(cuesheet);
return 1; return 1;
} }
flac_snprintf(tmpfilename, sizeof (tmpfilename), "%s.2", infilename); flac_snprintf(tmpfilename, sizeof (tmpfilename), "%s.2", tmpfilenamebase);
if(0 == (fout = flac_fopen(tmpfilename, "w"))) { if(0 == (fout = flac_fopen(tmpfilename, "w"))) {
fprintf(stderr, "can't open file %s for writing: %s\n", tmpfilename, strerror(errno)); fprintf(stderr, "can't open file %s for writing: %s\n", tmpfilename, strerror(errno));
FLAC__metadata_object_delete(cuesheet); FLAC__metadata_object_delete(cuesheet);

5
test/test_grabbag.sh
View File

@@ -118,8 +118,9 @@ for cuesheet in $good_cuesheets ; do
elif [ "$exit_code" != 0 ] ; then elif [ "$exit_code" != 0 ] ; then
die "Error: good cuesheet is broken" die "Error: good cuesheet is broken"
fi fi
cuesheet_pass1=${cuesheet}.1 cuesheet_out=$(echo $cuesheet | sed "s|${top_srcdir}/test/||")
cuesheet_pass2=${cuesheet}.2 cuesheet_pass1=${cuesheet_out}.1
cuesheet_pass2=${cuesheet_out}.2
diff $cuesheet_pass1 $cuesheet_pass2 >> $log 2>&1 || die "Error: pass1 and pass2 output differ" diff $cuesheet_pass1 $cuesheet_pass2 >> $log 2>&1 || die "Error: pass1 and pass2 output differ"
rm -f $cuesheet_pass1 $cuesheet_pass2 rm -f $cuesheet_pass1 $cuesheet_pass2
done done