claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Changes to testpregap.c to allow to build outside of the source tree.

Browse Source
This commit is contained in:
rocky
2008-05-05 23:58:28 +00:00
parent 49defd1cdc
commit 3f266b669b
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@@ -20,7 +20,7 @@ define(RELEASE_NUM, 81)
define(CDIO_VERSION_STR, 0.$1cvs) define(CDIO_VERSION_STR, 0.$1cvs)
AC_PREREQ(2.52) AC_PREREQ(2.52)
AC_REVISION([$Id: configure.ac,v 1.225 2008/04/24 07:28:00 rocky Exp $])dnl AC_REVISION([$Id: configure.ac,v 1.226 2008/05/05 23:58:28 rocky Exp $])dnl
AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM)) AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
AC_CONFIG_SRCDIR(src/cd-info.c) AC_CONFIG_SRCDIR(src/cd-info.c)
@@ -742,6 +742,7 @@ AC_CONFIG_FILES([
src/Makefile \ src/Makefile \
test/testbincue.c \ test/testbincue.c \
test/testisocd2.c \ test/testisocd2.c \
test/testpregap.c \
test/testnrg.c \ test/testnrg.c \
test/check_common_fn \ test/check_common_fn \
test/Makefile \ test/Makefile \

5
test/Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.66 2008/03/28 01:28:50 rocky Exp $ # $Id: Makefile.am,v 1.67 2008/05/05 23:58:28 rocky Exp $
# #
# Copyright (C) 2003, 2004, 2006, 2008 Rocky Bernstein <rocky@gnu.org> # Copyright (C) 2003, 2004, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
# #
@@ -88,7 +88,8 @@ check_DATA = vcd_demo.right vcd_demo_vcdinfo.right \
EXTRA_DIST = $(check_SCRIPTS) $(check_DATA) \ EXTRA_DIST = $(check_SCRIPTS) $(check_DATA) \
check_common_fn check_cue.sh.in check_nrg.sh.in \ check_common_fn check_cue.sh.in check_nrg.sh.in \
testbincue.c.in testnrg.c.in check_iso.sh.in p1.bin p1.cue p1.nrg testbincue.c.in testpregap.c.in testnrg.c.in \
check_iso.sh.in p1.bin p1.cue p1.nrg
TESTS = $(check_PROGRAMS) $(check_SCRIPTS) TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
XFAIL_TESTS = testassert XFAIL_TESTS = testassert

20
test/testpregap.c → test/testpregap.c.in
View File

@@ -1,5 +1,5 @@
/* /*
$Id: testpregap.c,v 1.2 2008/03/22 18:08:25 karl Exp $ $Id: testpregap.c.in,v 1.1 2008/05/05 23:58:28 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@gnu.org> Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2008 Robert W. Fuller <hydrologiccycle@gmail.com> Copyright (C) 2008 Robert W. Fuller <hydrologiccycle@gmail.com>
@@ -39,6 +39,10 @@
#endif #endif
#include <string.h> #include <string.h>
#ifndef TEST_DIR
#define TEST_DIR "@srcdir@"
#endif
static void static void
log_handler (cdio_log_level_t level, const char message[]) log_handler (cdio_log_level_t level, const char message[])
{ {
@@ -61,14 +65,14 @@ typedef struct _pregap_list_t {
static pregap_list_t pregapList[] = static pregap_list_t pregapList[] =
{ {
{ "t2.toc", 1, 4425 }, { "@srcdir@/t2.toc", 1, 4425 },
{ "t2.toc", 2, CDIO_INVALID_LSN }, { "@srcdir@/t2.toc", 2, CDIO_INVALID_LSN },
{ "p1.cue", 1, 0 }, { "@srcdir@/p1.cue", 1, 0 },
{ "p1.cue", 2, 150 }, { "@srcdir@/p1.cue", 2, 150 },
{ "p1.cue", 3, CDIO_INVALID_LSN }, { "@srcdir@/p1.cue", 3, CDIO_INVALID_LSN },
/* { "p1.nrg", 1, 0 }, Nero did not create the proper pre-gap - bleh */ /* { "p1.nrg", 1, 0 }, Nero did not create the proper pre-gap - bleh */
{ "p1.nrg", 2, 225 }, { "@srcdir@/p1.nrg", 2, 225 },
{ "p1.nrg", 3, CDIO_INVALID_LSN } { "@srcdir@/p1.nrg", 3, CDIO_INVALID_LSN }
}; };
#define NELEMS(v) (sizeof(v) / sizeof(v[0])) #define NELEMS(v) (sizeof(v) / sizeof(v[0]))