Since we have better TOC checking we now have to give real filenames.

Adjust for this. Also added a regression test with a bad file name.
This commit is contained in:
rocky
2005-01-23 00:45:57 +00:00
parent 971e5ae928
commit c9852fb89d
6 changed files with 26 additions and 12 deletions

View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.44 2005/01/22 23:57:10 rocky Exp $
# $Id: Makefile.am,v 1.45 2005/01/23 00:45:57 rocky Exp $
#
# Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
#
@@ -70,7 +70,7 @@ check_DATA = vcd_demo.right vcd_demo_vcdinfo.right \
bad-mode1.cue bad-msf-1.cue bad-msf-2.cue bad-msf-3.cue \
bad-mode1.toc bad-msf-1.toc bad-msf-2.toc bad-msf-3.toc \
bad-cat1.cue bad-cat2.cue bad-cat3.cue \
bad-cat1.toc bad-cat2.toc bad-cat3.toc \
bad-cat1.toc bad-cat2.toc bad-cat3.toc bad-file.toc \
copying.iso copying.right \
joliet.iso joliet.right joliet-nojoliet.right

13
test/bad-file.toc Normal file
View File

@@ -0,0 +1,13 @@
// $Id: bad-file.toc,v 1.1 2005/01/23 00:45:57 rocky Exp $
// XA disk
//
CD_ROM_XA
TRACK MODE2_FORM2
FILE "foo.bin" 00:00:00 00:13:57
TRACK MODE2_FORM1
PREGAP 0:2:0
FILE "foo.bin" 00:20:71 00:00:00

View File

@@ -1,13 +1,13 @@
// $Id: data5.toc,v 1.1 2004/05/08 20:36:02 rocky Exp $
// $Id: data5.toc,v 1.2 2005/01/23 00:45:57 rocky Exp $
// XA disk
//
CD_ROM_XA
TRACK MODE2_FORM2
FILE "vcd_demo.bin" 00:00:00 00:13:57
FILE "isofs-m1.bin" 00:00:00 00:13:57
TRACK MODE2_FORM1
PREGAP 0:2:0
FILE "vcd_demo.bin" 00:20:71 00:00:00
FILE "isofs-m1.bin" 00:20:71 00:00:00

View File

@@ -1,8 +1,8 @@
// $Id: data6.toc,v 1.1 2004/05/08 20:36:02 rocky Exp $
// $Id: data6.toc,v 1.2 2005/01/23 00:45:57 rocky Exp $
// MODE2 track
//
CD_ROM
TRACK MODE2
FILE "vcd_demo.bin" 00:00:00 00:13:57
FILE "isofs-m1.bin" 00:00:00 00:13:57

View File

@@ -1,13 +1,13 @@
// $Id: data7.toc,v 1.1 2004/05/09 17:05:34 rocky Exp $
// $Id: data7.toc,v 1.2 2005/01/23 00:45:57 rocky Exp $
// Video CD
//
CD_ROM_XA
TRACK MODE1 // ISO filesystem
FILE "vcd_demo.bin" 00:00:00 00:13:57
FILE "isofs-m1.bin" 00:00:00 00:13:57
TRACK MODE2_FORM_MIX // XA track with form 1 and form 2 sectors
PREGAP 0:2:0
FILE "vcd_demo.bin" 00:20:71 00:00:00
FILE "isofs-m1.bin" 00:20:71 00:00:00

View File

@@ -1,5 +1,5 @@
/*
$Id: testtoc.c,v 1.7 2005/01/16 04:35:08 rocky Exp $
$Id: testtoc.c,v 1.8 2005/01/23 00:45:57 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -43,7 +43,7 @@
#endif
#define NUM_GOOD_TOCS 16
#define NUM_BAD_TOCS 7
#define NUM_BAD_TOCS 8
int
main(int argc, const char *argv[])
{
@@ -73,6 +73,7 @@ main(int argc, const char *argv[])
"bad-cat1.toc",
"bad-cat2.toc",
"bad-cat3.toc",
"bad-file.toc",
"bad-mode1.toc"
};
int ret=0;