tests -> test

All public includes are included via #include <cdio/....h> rather than #include "....h" (removed -I $top_srcdir/include/cdio)
2003-04-22 12:09:08 +00:00
parent 03e4850106
commit adfb8564c9
51 changed files with 100 additions and 106 deletions
--- 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 <rocky@panix.com>
 #
@@ -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
--- 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 \
       ])

--- 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 <rocky@panix.com>
 #
@@ -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
+
--- a/include/cdio/cdio.h.in
+++ b/include/cdio/cdio.h.in
@@ -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 <hvr@gnu.org>
    Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -30,8 +30,7 @@
 */
 #define CDIO_API_VERSION 1

-/* Version of cdio package.  */
-#define CDIO_VERSION @VERSION@
+#include <cdio/version.h>

 #ifdef  HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -40,8 +39,8 @@
 #include <unistd.h>
 #endif

-#include "types.h"
-#include "sector.h"
+#include <cdio/types.h>
+#include <cdio/sector.h>

 /* Flags specifying the category of device to open or is opened. */
 #define CDIO_SRC_IS_DISK_IMAGE_MASK 0x0001
--- 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 <hvr@gnu.org>
    Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
@@ -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 <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>

+#include <cdio/logging.h>
+#include <cdio/sector.h>
+#include <cdio/util.h>
 #include "cdio_assert.h"
 #include "cdio_private.h"
-#include "logging.h"
-#include "sector.h"
-#include "util.h"
 #include "_cdio_stdio.h"

 /* reader */
--- 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 <hvr@gnu.org>
    Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
@@ -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 <cdio/sector.h>
+#include <cdio/util.h>
 #include "cdio_assert.h"
 #include "cdio_private.h"
-#include "sector.h"
-#include "util.h"

 #define DEFAULT_CDIO_DEVICE "/dev/rsr0c"
 #include <string.h>
--- 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 <rocky@panix.com>

@@ -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 <cdio/sector.h>
+#include <cdio/util.h>
 #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"
--- 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 <hvr@gnu.org>
    Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
@@ -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 <stdio.h>
 #include <stdlib.h>
@@ -40,10 +40,10 @@ static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.6 2003/04/10 04:13:41 roc
 #include <sys/types.h>
 #include <sys/ioctl.h>

+#include <cdio/sector.h>
+#include <cdio/util.h>
 #include "cdio_assert.h"
 #include "cdio_private.h"
-#include "sector.h"
-#include "util.h"
 #include "_cdio_stdio.h"

 /*!
--- 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 <hvr@gnu.org>
    Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
@@ -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 <string.h>

+#include <cdio/sector.h>
+#include <cdio/util.h>
 #include "cdio_assert.h"
 #include "cdio_private.h"
-#include "sector.h"
-#include "util.h"

 #define DEFAULT_CDIO_DEVICE "/dev/cdrom"

--- 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 <hvr@gnu.org>

@@ -29,16 +29,16 @@
 #include <stdlib.h>
 #include <string.h>

+#include <cdio/logging.h>
+#include <cdio/sector.h>
+#include <cdio/util.h>
 #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 */

--- 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 <hvr@gnu.org>
    Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -30,12 +30,12 @@
 #include <sys/stat.h>
 #include <errno.h>

-#include "logging.h"
-#include "util.h"
+#include <cdio/logging.h>
+#include <cdio/util.h>
 #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)

--- 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 <hvr@gnu.org>

@@ -30,11 +30,11 @@

 /* #define STREAM_DEBUG  */

-#include "logging.h"
-#include "util.h"
+#include <cdio/logging.h>
+#include <cdio/util.h>
 #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
--- 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 <hvr@gnu.org>
    Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -23,7 +23,7 @@
 #ifndef __CDIO_STREAM_H__
 #define __CDIO_STREAM_H__

-#include "types.h"
+#include <cdio/types.h>
 #include "cdio_private.h"

 #ifdef __cplusplus
--- 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 <hvr@gnu.org>
    Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
@@ -25,17 +25,17 @@

 #include <string.h>

+#include <cdio/logging.h>
+#include <cdio/sector.h>
+#include <cdio/util.h>
 #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 <stdio.h>
 #include <stdlib.h>
--- 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 <hvr@gnu.org>

@@ -21,8 +21,8 @@
 #ifndef __CDIO_BYTESEX_H__
 #define __CDIO_BYTESEX_H__

-#include "types.h"
-#include "logging.h"
+#include <cdio/logging.h>
+#include <cdio/types.h>
 #include "bytesex_asm.h"

 /* generic byteswap routines */
--- 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 <ac-logic@freenet.de>
                  2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -23,7 +23,7 @@
 #define __CDIO_BYTESEX_ASM_H__
 #if !defined(DISABLE_ASM_OPTIMIZE)

-#include "types.h"
+#include <cdio/types.h>

 #if defined(__powerpc__) && defined(__GNUC__)

--- 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 <rocky@panix.com>
    Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -31,11 +31,11 @@
 #include <string.h>

 #include "cdio_assert.h"
-#include "util.h"
-#include "logging.h"
+#include <cdio/util.h>
+#include <cdio/logging.h>
 #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] = 
--- 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 <hvr@gnu.org>

@@ -23,8 +23,8 @@

 #if defined(__GNUC__)

-#include "types.h"
-#include "logging.h"
+#include <cdio/types.h>
+#include <cdio/logging.h>

 #define cdio_assert(expr) \
 { \
--- 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 <rocky@panix.com>

@@ -31,7 +31,7 @@
 #include <unistd.h>
 #endif

-#include <cdio.h>
+#include <cdio/cdio.h>

 #ifdef __cplusplus
 extern "C" {
--- 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 <hvr@gnu.org>

@@ -26,11 +26,11 @@
 #include <string.h>

 #include "ds.h"
-#include "util.h"
-#include "types.h"
+#include <cdio/util.h>
+#include <cdio/types.h>
 #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
 {
--- 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 <hvr@gnu.org>

@@ -21,7 +21,7 @@
 #ifndef __CDIO_DS_H__
 #define __CDIO_DS_H__

-#include "types.h"
+#include <cdio/types.h>

 /* opaque... */
 typedef struct _CdioList CdioList;
--- 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 <hvr@gnu.org>

@@ -25,11 +25,12 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
+
+#include <cdio/logging.h>
 #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[])
--- 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 <hvr@gnu.org>

@@ -22,11 +22,11 @@
 # include "config.h"
 #endif

+#include <cdio/sector.h>
+#include <cdio/util.h>
 #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)
--- 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 <hvr@gnu.org>
    Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -29,9 +29,9 @@
 #include <string.h>

 #include "cdio_assert.h"
-#include "util.h"
+#include <cdio/util.h>

-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)
--- 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 <rocky@panix.com>
    Copyright (C) 1996,1997,1998  Gerd Knorr <kraxel@bytesex.org>
@@ -46,9 +46,9 @@
 #include <cddb/cddb.h>
 #endif

-#include "cdio.h"
-#include "logging.h"
-#include "util.h"
+#include <cdio/cdio.h>
+#include <cdio/logging.h>
+#include <cdio/util.h>

 #include <fcntl.h>
 #include <sys/ioctl.h>
--- a/tests/.cvsignore
+++ b/tests/.cvsignore
--- a/tests/Makefile.am
+++ b/tests/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 <rocky@panix.com>
 #
@@ -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
--- a/tests/cdda.right
+++ b/tests/cdda.right
--- a/tests/check_common_fn
+++ b/tests/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() {
--- a/tests/check_cue.sh.in
+++ b/tests/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
--- a/tests/check_nrg.sh
+++ b/tests/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`
--- a/tests/check_opts.sh
+++ b/tests/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`
--- a/tests/check_opts0.right
+++ b/tests/check_opts0.right
--- a/tests/check_opts1.right
+++ b/tests/check_opts1.right
--- a/tests/check_opts2.right
+++ b/tests/check_opts2.right
--- a/tests/check_opts3.right
+++ b/tests/check_opts3.right
--- a/tests/check_opts4.right
+++ b/tests/check_opts4.right
--- a/tests/check_opts5.right
+++ b/tests/check_opts5.right
--- a/tests/check_opts6.right
+++ b/tests/check_opts6.right
--- a/tests/check_opts7.right
+++ b/tests/check_opts7.right
--- a/tests/fsf.right
+++ b/tests/fsf.right
--- a/tests/isofs-m1.right
+++ b/tests/isofs-m1.right
--- a/tests/monvoisin.right
+++ b/tests/monvoisin.right
--- a/tests/svcd_ogt_test_ntsc.right
+++ b/tests/svcd_ogt_test_ntsc.right
--- a/tests/svcdgs.right
+++ b/tests/svcdgs.right
--- a/tests/vcd_demo.right
+++ b/tests/vcd_demo.right
--- a/tests/cdda.bin
+++ b/tests/cdda.bin
--- a/tests/cdda.cue
+++ b/tests/cdda.cue
@@ -1,3 +0,0 @@
-FILE "BOING.BIN" BINARY
-  TRACK 01 AUDIO
-    INDEX 01 00:00:00
--- a/tests/isofs-m1.bin
+++ b/tests/isofs-m1.bin
--- a/tests/isofs-m1.cue
+++ b/tests/isofs-m1.cue
@@ -1,3 +0,0 @@
-FILE "ISOFS-M1.BIN" BINARY
-  TRACK 01 MODE1/2352
-    INDEX 01 00:00:00
--- a/tests/vcd_demo.bin
+++ b/tests/vcd_demo.bin