diff --git a/Makefile.am b/Makefile.am index 0ac25883..1b191b7c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.6 2003/04/22 01:34:20 rocky Exp $ +# $Id: Makefile.am,v 1.7 2003/04/22 12:09:08 rocky Exp $ # # Copyright (C) 2003 Rocky Bernstein # @@ -22,8 +22,8 @@ EXTRA_DIST = libpopt.m4 THANKS -# SUBDIRS = doc include lib src tests -SUBDIRS = include lib src tests +# SUBDIRS = doc include lib src test +SUBDIRS = include lib src test # pkg-config(1) related rules pkgconfigdir = $(libdir)/pkgconfig diff --git a/configure.ac b/configure.ac index 2355c0f9..8a05672b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ -AC_REVISION([$Id: configure.ac,v 1.15 2003/04/21 10:17:50 hvr Exp $])dnl +AC_REVISION([$Id: configure.ac,v 1.16 2003/04/22 12:09:08 rocky Exp $])dnl AC_INIT(lib/cdio.c) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libcdio, 0.3) +AM_INIT_AUTOMAKE(libcdio, 0.4) AM_SANITY_CHECK @@ -138,7 +138,7 @@ AC_STDC_HEADERS AC_HAVE_HEADERS( stdbool.h stdlib.h stdint.h stdio.h string.h strings.h linux/version.h sys/cdio.h sys/stat.h sys/types.h ) -LIBCDIO_CFLAGS='-I$(top_srcdir)/lib/ -I$(top_srcdir)/include/ -I$(top_srcdir)/include/cdio' +LIBCDIO_CFLAGS='-I$(top_srcdir)/lib/ -I$(top_srcdir)/include/ -I$(top_builddir)/include' LIBCDIO_LIBS='$(top_builddir)/lib/libcdio.la' AC_SUBST(LIBCDIO_CFLAGS) AC_SUBST(LIBCDIO_LIBS) @@ -210,7 +210,7 @@ fi AC_SUBST(CDDB_LIB) AC_CONFIG_COMMANDS([checks], - [chmod +x tests/check_cue.sh + [chmod +x test/check_cue.sh ]) AC_OUTPUT([ \ @@ -218,10 +218,10 @@ AC_OUTPUT([ \ libcdio.pc \ include/Makefile \ include/cdio/Makefile \ - include/cdio/cdio.h \ + include/cdio/version.h \ lib/Makefile \ src/Makefile \ - tests/check_cue.sh \ - tests/Makefile \ + test/check_cue.sh \ + test/Makefile \ ]) diff --git a/include/cdio/Makefile.am b/include/cdio/Makefile.am index 590672d6..a5232a8e 100644 --- a/include/cdio/Makefile.am +++ b/include/cdio/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.3 2003/04/21 14:13:54 hvr Exp $ +# $Id: Makefile.am,v 1.4 2003/04/22 12:09:08 rocky Exp $ # # Copyright (C) 2003 Rocky Bernstein # @@ -21,10 +21,9 @@ ######################################################## # -# generated part should be put into version.h.in and included from cdio.h -EXTRA_DIST = cdio.h.in - libcdioincludedir=$(includedir)/cdio libcdioinclude_HEADERS = cdio.h logging.h sector.h types.h util.h -BUILT_SOURCES = cdio.h +EXTRA_DIST = version.h.in +BUILT_SOURCES = version.h + diff --git a/include/cdio/cdio.h.in b/include/cdio/cdio.h similarity index 98% rename from include/cdio/cdio.h.in rename to include/cdio/cdio.h index e42f31ef..f19322fd 100644 --- a/include/cdio/cdio.h.in +++ b/include/cdio/cdio.h @@ -1,5 +1,5 @@ /* -*- c -*- - $Id: cdio.h.in,v 1.4 2003/04/21 23:27:57 rocky Exp $ + $Id: cdio.h,v 1.6 2003/04/22 12:09:08 rocky Exp $ Copyright (C) 2001 Herbert Valerio Riedel Copyright (C) 2003 Rocky Bernstein @@ -30,8 +30,7 @@ */ #define CDIO_API_VERSION 1 -/* Version of cdio package. */ -#define CDIO_VERSION @VERSION@ +#include #ifdef HAVE_SYS_TYPES_H #include @@ -40,8 +39,8 @@ #include #endif -#include "types.h" -#include "sector.h" +#include +#include /* Flags specifying the category of device to open or is opened. */ #define CDIO_SRC_IS_DISK_IMAGE_MASK 0x0001 diff --git a/lib/_cdio_bincue.c b/lib/_cdio_bincue.c index 4c07c655..1810e62e 100644 --- a/lib/_cdio_bincue.c +++ b/lib/_cdio_bincue.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_bincue.c,v 1.17 2003/04/14 23:11:32 rocky Exp $ + $Id: _cdio_bincue.c,v 1.18 2003/04/22 12:09:08 rocky Exp $ Copyright (C) 2001 Herbert Valerio Riedel Copyright (C) 2002,2003 Rocky Bernstein @@ -28,18 +28,18 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: _cdio_bincue.c,v 1.17 2003/04/14 23:11:32 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_bincue.c,v 1.18 2003/04/22 12:09:08 rocky Exp $"; #include #include #include #include +#include +#include +#include #include "cdio_assert.h" #include "cdio_private.h" -#include "logging.h" -#include "sector.h" -#include "util.h" #include "_cdio_stdio.h" /* reader */ diff --git a/lib/_cdio_bsdi.c b/lib/_cdio_bsdi.c index dc4259f8..1fa12d52 100644 --- a/lib/_cdio_bsdi.c +++ b/lib/_cdio_bsdi.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_bsdi.c,v 1.8 2003/04/10 04:13:41 rocky Exp $ + $Id: _cdio_bsdi.c,v 1.9 2003/04/22 12:09:08 rocky Exp $ Copyright (C) 2001 Herbert Valerio Riedel Copyright (C) 2002,2003 Rocky Bernstein @@ -27,12 +27,12 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: _cdio_bsdi.c,v 1.8 2003/04/10 04:13:41 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_bsdi.c,v 1.9 2003/04/22 12:09:08 rocky Exp $"; +#include +#include #include "cdio_assert.h" #include "cdio_private.h" -#include "sector.h" -#include "util.h" #define DEFAULT_CDIO_DEVICE "/dev/rsr0c" #include diff --git a/lib/_cdio_freebsd.c b/lib/_cdio_freebsd.c index e70f42a6..3d7c2ce4 100644 --- a/lib/_cdio_freebsd.c +++ b/lib/_cdio_freebsd.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_freebsd.c,v 1.8 2003/04/22 02:48:33 rocky Exp $ + $Id: _cdio_freebsd.c,v 1.9 2003/04/22 12:09:08 rocky Exp $ Copyright (C) 2003 Rocky Bernstein @@ -26,12 +26,12 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: _cdio_freebsd.c,v 1.8 2003/04/22 02:48:33 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_freebsd.c,v 1.9 2003/04/22 12:09:08 rocky Exp $"; +#include +#include #include "cdio_assert.h" #include "cdio_private.h" -#include "sector.h" -#include "util.h" /* Is this the right default? */ #define DEFAULT_CDIO_DEVICE "/dev/acd0c" diff --git a/lib/_cdio_generic.c b/lib/_cdio_generic.c index 1ec267e4..eb950fa1 100644 --- a/lib/_cdio_generic.c +++ b/lib/_cdio_generic.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_generic.c,v 1.6 2003/04/10 04:13:41 rocky Exp $ + $Id: _cdio_generic.c,v 1.7 2003/04/22 12:09:09 rocky Exp $ Copyright (C) 2001 Herbert Valerio Riedel Copyright (C) 2002,2003 Rocky Bernstein @@ -27,7 +27,7 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.6 2003/04/10 04:13:41 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.7 2003/04/22 12:09:09 rocky Exp $"; #include #include @@ -40,10 +40,10 @@ static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.6 2003/04/10 04:13:41 roc #include #include +#include +#include #include "cdio_assert.h" #include "cdio_private.h" -#include "sector.h" -#include "util.h" #include "_cdio_stdio.h" /*! diff --git a/lib/_cdio_linux.c b/lib/_cdio_linux.c index 7f187814..3e5e9868 100644 --- a/lib/_cdio_linux.c +++ b/lib/_cdio_linux.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_linux.c,v 1.10 2003/04/15 05:19:00 rocky Exp $ + $Id: _cdio_linux.c,v 1.11 2003/04/22 12:09:09 rocky Exp $ Copyright (C) 2001 Herbert Valerio Riedel Copyright (C) 2002,2003 Rocky Bernstein @@ -27,14 +27,14 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.10 2003/04/15 05:19:00 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.11 2003/04/22 12:09:09 rocky Exp $"; #include +#include +#include #include "cdio_assert.h" #include "cdio_private.h" -#include "sector.h" -#include "util.h" #define DEFAULT_CDIO_DEVICE "/dev/cdrom" diff --git a/lib/_cdio_nrg.c b/lib/_cdio_nrg.c index fcc4adf9..e8fc2b31 100644 --- a/lib/_cdio_nrg.c +++ b/lib/_cdio_nrg.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_nrg.c,v 1.12 2003/04/21 23:24:46 rocky Exp $ + $Id: _cdio_nrg.c,v 1.13 2003/04/22 12:09:09 rocky Exp $ Copyright (C) 2001,2003 Herbert Valerio Riedel @@ -29,16 +29,16 @@ #include #include +#include +#include +#include #include "cdio_assert.h" #include "bytesex.h" #include "ds.h" #include "cdio_private.h" -#include "logging.h" -#include "sector.h" -#include "util.h" #include "_cdio_stdio.h" -static const char _rcsid[] = "$Id: _cdio_nrg.c,v 1.12 2003/04/21 23:24:46 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_nrg.c,v 1.13 2003/04/22 12:09:09 rocky Exp $"; /* structures used */ diff --git a/lib/_cdio_stdio.c b/lib/_cdio_stdio.c index 94acb49c..97af4025 100644 --- a/lib/_cdio_stdio.c +++ b/lib/_cdio_stdio.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_stdio.c,v 1.3 2003/04/06 23:40:21 rocky Exp $ + $Id: _cdio_stdio.c,v 1.4 2003/04/22 12:09:09 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel Copyright (C) 2003 Rocky Bernstein @@ -30,12 +30,12 @@ #include #include -#include "logging.h" -#include "util.h" +#include +#include #include "_cdio_stream.h" #include "_cdio_stdio.h" -static const char _rcsid[] = "$Id: _cdio_stdio.c,v 1.3 2003/04/06 23:40:21 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_stdio.c,v 1.4 2003/04/22 12:09:09 rocky Exp $"; #define CDIO_STDIO_BUFSIZE (128*1024) diff --git a/lib/_cdio_stream.c b/lib/_cdio_stream.c index f1295e03..cda1ec33 100644 --- a/lib/_cdio_stream.c +++ b/lib/_cdio_stream.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_stream.c,v 1.5 2003/04/07 03:05:31 rocky Exp $ + $Id: _cdio_stream.c,v 1.6 2003/04/22 12:09:09 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel @@ -30,11 +30,11 @@ /* #define STREAM_DEBUG */ -#include "logging.h" -#include "util.h" +#include +#include #include "_cdio_stream.h" -static const char _rcsid[] = "$Id: _cdio_stream.c,v 1.5 2003/04/07 03:05:31 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_stream.c,v 1.6 2003/04/22 12:09:09 rocky Exp $"; /* * DataSource implementations diff --git a/lib/_cdio_stream.h b/lib/_cdio_stream.h index f9d65c74..e3d74f40 100644 --- a/lib/_cdio_stream.h +++ b/lib/_cdio_stream.h @@ -1,5 +1,5 @@ /* - $Id: _cdio_stream.h,v 1.5 2003/04/07 11:23:24 rocky Exp $ + $Id: _cdio_stream.h,v 1.6 2003/04/22 12:09:09 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel Copyright (C) 2003 Rocky Bernstein @@ -23,7 +23,7 @@ #ifndef __CDIO_STREAM_H__ #define __CDIO_STREAM_H__ -#include "types.h" +#include #include "cdio_private.h" #ifdef __cplusplus diff --git a/lib/_cdio_sunos.c b/lib/_cdio_sunos.c index dfb8acdb..3759c687 100644 --- a/lib/_cdio_sunos.c +++ b/lib/_cdio_sunos.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_sunos.c,v 1.11 2003/04/11 17:31:50 rocky Exp $ + $Id: _cdio_sunos.c,v 1.12 2003/04/22 12:09:09 rocky Exp $ Copyright (C) 2001 Herbert Valerio Riedel Copyright (C) 2002,2003 Rocky Bernstein @@ -25,17 +25,17 @@ #include +#include +#include +#include #include "cdio_assert.h" #include "cdio_private.h" -#include "logging.h" -#include "sector.h" -#include "util.h" #define DEFAULT_CDIO_DEVICE "/vol/dev/aliases/cdrom0" #ifdef HAVE_SOLARIS_CDROM -static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.11 2003/04/11 17:31:50 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.12 2003/04/22 12:09:09 rocky Exp $"; #include #include diff --git a/lib/bytesex.h b/lib/bytesex.h index d4d1ae19..1e9155b5 100644 --- a/lib/bytesex.h +++ b/lib/bytesex.h @@ -1,5 +1,5 @@ /* - $Id: bytesex.h,v 1.2 2003/04/03 12:16:27 rocky Exp $ + $Id: bytesex.h,v 1.3 2003/04/22 12:09:09 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel @@ -21,8 +21,8 @@ #ifndef __CDIO_BYTESEX_H__ #define __CDIO_BYTESEX_H__ -#include "types.h" -#include "logging.h" +#include +#include #include "bytesex_asm.h" /* generic byteswap routines */ diff --git a/lib/bytesex_asm.h b/lib/bytesex_asm.h index a4dfeaca..2b56e382 100644 --- a/lib/bytesex_asm.h +++ b/lib/bytesex_asm.h @@ -1,5 +1,5 @@ /* - $Id: bytesex_asm.h,v 1.2 2003/04/03 12:16:27 rocky Exp $ + $Id: bytesex_asm.h,v 1.3 2003/04/22 12:09:09 rocky Exp $ Copyright (C) 2001 Sven Ottemann 2001 Herbert Valerio Riedel @@ -23,7 +23,7 @@ #define __CDIO_BYTESEX_ASM_H__ #if !defined(DISABLE_ASM_OPTIMIZE) -#include "types.h" +#include #if defined(__powerpc__) && defined(__GNUC__) diff --git a/lib/cdio.c b/lib/cdio.c index eea14baf..59f8468a 100644 --- a/lib/cdio.c +++ b/lib/cdio.c @@ -1,5 +1,5 @@ /* - $Id: cdio.c,v 1.10 2003/04/20 15:34:31 rocky Exp $ + $Id: cdio.c,v 1.11 2003/04/22 12:09:09 rocky Exp $ Copyright (C) 2003 Rocky Bernstein Copyright (C) 2001 Herbert Valerio Riedel @@ -31,11 +31,11 @@ #include #include "cdio_assert.h" -#include "util.h" -#include "logging.h" +#include +#include #include "cdio_private.h" -static const char _rcsid[] = "$Id: cdio.c,v 1.10 2003/04/20 15:34:31 rocky Exp $"; +static const char _rcsid[] = "$Id: cdio.c,v 1.11 2003/04/22 12:09:09 rocky Exp $"; const char *track_format2str[5] = diff --git a/lib/cdio_assert.h b/lib/cdio_assert.h index 0e408a56..09d7c479 100644 --- a/lib/cdio_assert.h +++ b/lib/cdio_assert.h @@ -1,5 +1,5 @@ /* - $Id: cdio_assert.h,v 1.2 2003/04/03 12:16:27 rocky Exp $ + $Id: cdio_assert.h,v 1.3 2003/04/22 12:09:09 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel @@ -23,8 +23,8 @@ #if defined(__GNUC__) -#include "types.h" -#include "logging.h" +#include +#include #define cdio_assert(expr) \ { \ diff --git a/lib/cdio_private.h b/lib/cdio_private.h index 0776c5c4..a02e03d0 100644 --- a/lib/cdio_private.h +++ b/lib/cdio_private.h @@ -1,5 +1,5 @@ /* - $Id: cdio_private.h,v 1.6 2003/04/10 04:13:41 rocky Exp $ + $Id: cdio_private.h,v 1.7 2003/04/22 12:09:09 rocky Exp $ Copyright (C) 2003 Rocky Bernstein @@ -31,7 +31,7 @@ #include #endif -#include +#include #ifdef __cplusplus extern "C" { diff --git a/lib/ds.c b/lib/ds.c index fc818945..dac14d01 100644 --- a/lib/ds.c +++ b/lib/ds.c @@ -1,5 +1,5 @@ /* - $Id: ds.c,v 1.2 2003/04/03 12:16:27 rocky Exp $ + $Id: ds.c,v 1.3 2003/04/22 12:09:09 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel @@ -26,11 +26,11 @@ #include #include "ds.h" -#include "util.h" -#include "types.h" +#include +#include #include "cdio_assert.h" -static const char _rcsid[] = "$Id: ds.c,v 1.2 2003/04/03 12:16:27 rocky Exp $"; +static const char _rcsid[] = "$Id: ds.c,v 1.3 2003/04/22 12:09:09 rocky Exp $"; struct _CdioList { diff --git a/lib/ds.h b/lib/ds.h index 2fd34973..55d543fd 100644 --- a/lib/ds.h +++ b/lib/ds.h @@ -1,5 +1,5 @@ /* - $Id: ds.h,v 1.2 2003/04/03 12:16:27 rocky Exp $ + $Id: ds.h,v 1.3 2003/04/22 12:09:09 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel @@ -21,7 +21,7 @@ #ifndef __CDIO_DS_H__ #define __CDIO_DS_H__ -#include "types.h" +#include /* opaque... */ typedef struct _CdioList CdioList; diff --git a/lib/logging.c b/lib/logging.c index 75f563dc..642eb34d 100644 --- a/lib/logging.c +++ b/lib/logging.c @@ -1,5 +1,5 @@ /* - $Id: logging.c,v 1.1 2003/03/24 19:01:09 rocky Exp $ + $Id: logging.c,v 1.2 2003/04/22 12:09:09 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel @@ -25,11 +25,12 @@ #include #include #include + +#include #include "cdio_assert.h" -#include "logging.h" -static const char _rcsid[] = "$Id: logging.c,v 1.1 2003/03/24 19:01:09 rocky Exp $"; +static const char _rcsid[] = "$Id: logging.c,v 1.2 2003/04/22 12:09:09 rocky Exp $"; static void default_cdio_log_handler (cdio_log_level_t level, const char message[]) diff --git a/lib/sector.c b/lib/sector.c index 323bf25d..4f96cc54 100644 --- a/lib/sector.c +++ b/lib/sector.c @@ -1,5 +1,5 @@ /* - $Id: sector.c,v 1.2 2003/04/11 17:33:03 rocky Exp $ + $Id: sector.c,v 1.3 2003/04/22 12:09:09 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel @@ -22,11 +22,11 @@ # include "config.h" #endif +#include +#include #include "cdio_assert.h" -#include "sector.h" -#include "util.h" -static const char _rcsid[] = "$Id: sector.c,v 1.2 2003/04/11 17:33:03 rocky Exp $"; +static const char _rcsid[] = "$Id: sector.c,v 1.3 2003/04/22 12:09:09 rocky Exp $"; void cdio_lba_to_msf (uint32_t lba, msf_t *msf) diff --git a/lib/util.c b/lib/util.c index ef70e5b4..dc38a7fa 100644 --- a/lib/util.c +++ b/lib/util.c @@ -1,5 +1,5 @@ /* - $Id: util.c,v 1.1 2003/03/24 19:01:09 rocky Exp $ + $Id: util.c,v 1.2 2003/04/22 12:09:09 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel Copyright (C) 2003 Rocky Bernstein @@ -29,9 +29,9 @@ #include #include "cdio_assert.h" -#include "util.h" +#include -static const char _rcsid[] = "$Id: util.c,v 1.1 2003/03/24 19:01:09 rocky Exp $"; +static const char _rcsid[] = "$Id: util.c,v 1.2 2003/04/22 12:09:09 rocky Exp $"; size_t _cdio_strlenv(char **str_array) diff --git a/src/cdinfo.c b/src/cdinfo.c index ff47f280..bd43b936 100644 --- a/src/cdinfo.c +++ b/src/cdinfo.c @@ -1,5 +1,5 @@ /* - $Id: cdinfo.c,v 1.15 2003/04/21 23:20:37 rocky Exp $ + $Id: cdinfo.c,v 1.16 2003/04/22 12:09:09 rocky Exp $ Copyright (C) 2003 Rocky Bernstein Copyright (C) 1996,1997,1998 Gerd Knorr @@ -46,9 +46,9 @@ #include #endif -#include "cdio.h" -#include "logging.h" -#include "util.h" +#include +#include +#include #include #include diff --git a/tests/.cvsignore b/test/.cvsignore similarity index 100% rename from tests/.cvsignore rename to test/.cvsignore diff --git a/tests/Makefile.am b/test/Makefile.am similarity index 94% rename from tests/Makefile.am rename to test/Makefile.am index 35378aa7..d8bdfa91 100644 --- a/tests/Makefile.am +++ b/test/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.9 2003/04/20 17:24:49 rocky Exp $ +# $Id: Makefile.am,v 1.1 2003/04/22 12:09:09 rocky Exp $ # # Copyright (C) 2003 Rocky Bernstein # @@ -32,6 +32,7 @@ check_DATA = vcd_demo.right \ EXTRA_DIST = $(check_SCRIPTS) $(check_DATA) \ check_common_fn check_cue.sh.in +TESTS_ENVIRONMENT=$(SHELL) TESTS = $(check_SCRIPTS) MOSTLYCLEANFILES = core.* *.dump diff --git a/tests/cdda.right b/test/cdda.right similarity index 100% rename from tests/cdda.right rename to test/cdda.right diff --git a/tests/check_common_fn b/test/check_common_fn similarity index 94% rename from tests/check_common_fn rename to test/check_common_fn index c6456f15..95c9c48b 100755 --- a/tests/check_common_fn +++ b/test/check_common_fn @@ -1,4 +1,4 @@ -# $Id: check_common_fn,v 1.2 2003/04/19 19:12:06 rocky Exp $ +# $Id: check_common_fn,v 1.1 2003/04/22 12:09:09 rocky Exp $ SKIP_TEST_EXITCODE=77 have_cmp() { diff --git a/tests/check_cue.sh.in b/test/check_cue.sh.in similarity index 95% rename from tests/check_cue.sh.in rename to test/check_cue.sh.in index bf73aae6..ef866d48 100644 --- a/tests/check_cue.sh.in +++ b/test/check_cue.sh.in @@ -1,5 +1,5 @@ #!/bin/sh -#$Id: check_cue.sh.in,v 1.1 2003/04/20 19:23:23 rocky Exp $ +#$Id: check_cue.sh.in,v 1.1 2003/04/22 12:09:09 rocky Exp $ if test -n "@CDDB_LIB@" ; then cddb_opt='--no-cddb' fi diff --git a/tests/check_nrg.sh b/test/check_nrg.sh similarity index 93% rename from tests/check_nrg.sh rename to test/check_nrg.sh index 074044fa..6992b108 100755 --- a/tests/check_nrg.sh +++ b/test/check_nrg.sh @@ -1,5 +1,5 @@ #!/bin/sh -#$Id: check_nrg.sh,v 1.3 2003/04/22 01:32:39 rocky Exp $ +#$Id: check_nrg.sh,v 1.1 2003/04/22 12:09:09 rocky Exp $ if test -z $srcdir ; then srcdir=`pwd` diff --git a/tests/check_opts.sh b/test/check_opts.sh similarity index 90% rename from tests/check_opts.sh rename to test/check_opts.sh index 7cd5120c..8ad2c917 100755 --- a/tests/check_opts.sh +++ b/test/check_opts.sh @@ -1,5 +1,5 @@ #!/bin/sh -#$Id: check_opts.sh,v 1.3 2003/04/20 17:24:49 rocky Exp $ +#$Id: check_opts.sh,v 1.1 2003/04/22 12:09:09 rocky Exp $ # Check cdinfo options if test -z "$srcdir" ; then srcdir=`pwd` diff --git a/tests/check_opts0.right b/test/check_opts0.right similarity index 100% rename from tests/check_opts0.right rename to test/check_opts0.right diff --git a/tests/check_opts1.right b/test/check_opts1.right similarity index 100% rename from tests/check_opts1.right rename to test/check_opts1.right diff --git a/tests/check_opts2.right b/test/check_opts2.right similarity index 100% rename from tests/check_opts2.right rename to test/check_opts2.right diff --git a/tests/check_opts3.right b/test/check_opts3.right similarity index 100% rename from tests/check_opts3.right rename to test/check_opts3.right diff --git a/tests/check_opts4.right b/test/check_opts4.right similarity index 100% rename from tests/check_opts4.right rename to test/check_opts4.right diff --git a/tests/check_opts5.right b/test/check_opts5.right similarity index 100% rename from tests/check_opts5.right rename to test/check_opts5.right diff --git a/tests/check_opts6.right b/test/check_opts6.right similarity index 100% rename from tests/check_opts6.right rename to test/check_opts6.right diff --git a/tests/check_opts7.right b/test/check_opts7.right similarity index 100% rename from tests/check_opts7.right rename to test/check_opts7.right diff --git a/tests/fsf.right b/test/fsf.right similarity index 100% rename from tests/fsf.right rename to test/fsf.right diff --git a/tests/isofs-m1.right b/test/isofs-m1.right similarity index 100% rename from tests/isofs-m1.right rename to test/isofs-m1.right diff --git a/tests/monvoisin.right b/test/monvoisin.right similarity index 100% rename from tests/monvoisin.right rename to test/monvoisin.right diff --git a/tests/svcd_ogt_test_ntsc.right b/test/svcd_ogt_test_ntsc.right similarity index 100% rename from tests/svcd_ogt_test_ntsc.right rename to test/svcd_ogt_test_ntsc.right diff --git a/tests/svcdgs.right b/test/svcdgs.right similarity index 100% rename from tests/svcdgs.right rename to test/svcdgs.right diff --git a/tests/vcd_demo.right b/test/vcd_demo.right similarity index 100% rename from tests/vcd_demo.right rename to test/vcd_demo.right diff --git a/tests/cdda.bin b/tests/cdda.bin deleted file mode 100644 index b1ba1f5e..00000000 Binary files a/tests/cdda.bin and /dev/null differ diff --git a/tests/cdda.cue b/tests/cdda.cue deleted file mode 100644 index c7396d94..00000000 --- a/tests/cdda.cue +++ /dev/null @@ -1,3 +0,0 @@ -FILE "BOING.BIN" BINARY - TRACK 01 AUDIO - INDEX 01 00:00:00 diff --git a/tests/isofs-m1.bin b/tests/isofs-m1.bin deleted file mode 100644 index adaea5c3..00000000 Binary files a/tests/isofs-m1.bin and /dev/null differ diff --git a/tests/isofs-m1.cue b/tests/isofs-m1.cue deleted file mode 100644 index 677a803f..00000000 --- a/tests/isofs-m1.cue +++ /dev/null @@ -1,3 +0,0 @@ -FILE "ISOFS-M1.BIN" BINARY - TRACK 01 MODE1/2352 - INDEX 01 00:00:00 diff --git a/tests/vcd_demo.bin b/tests/vcd_demo.bin deleted file mode 100644 index acd2735c..00000000 Binary files a/tests/vcd_demo.bin and /dev/null differ