testtoc -> driver/cdrdao.c.in

configure.ac

@@ -663,6 +663,7 @@ AC_CONFIG_FILES([
        test/data/Makefile \
        test/driver/Makefile \
        test/driver/bincue.c \
+       test/driver/cdrdao.c \
        test/driver/nrg.c \
        test/testgetdevices.c \
        test/testisocd2.c \

doc/.gitignore

@@ -8,6 +8,7 @@
 /libcdio.info
 /libcdio.ky
 /libcdio.log
+/libcdio.pdf
 /libcdio.pg
 /libcdio.toc
 /libcdio.tp

test/Makefile.am

@@ -30,7 +30,7 @@ endif
 
 hack = check_sizeof testassert testgetdevices testischar \
        testisocd testisocd2 testiso9660 test_lib_driver_util \
-       $(testparanoia) testtoc testpregap 
+       $(testparanoia) testpregap 
 
 EXTRA_PROGRAMS = testdefault 
 DATA_DIR       = @abs_top_srcdir@/test/data
@@ -48,9 +48,6 @@ testiso9660_LDADD     = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
 testisocd_LDADD     = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
 testisocd2_LDADD    = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
 
-testtoc_LDADD       = $(LIBCDIO_LIBS) $(LTLIBICONV)
-testtoc_CFLAGS      = -DDATA_DIR=\"$(DATA_DIR)\"
-
 test_lib_driver_util_LDADD    = $(LIBCDIO_LIBS) $(LTLIBICONV)
 test_lib_driver_util_CFLAGS   = -DDATA_DIR=\"$(DATA_DIR)\"
 

test/driver/.gitignore

@@ -1,15 +1,16 @@
-/*.o
 /*.exe
+/*.o
 /*~
 /.deps
 /.libs
 /Makefile
 /Makefile.in
 /bincue
+/bincue
 /bincue.c
+/cdrdao.c
 /follow_symlink
 /freebsd
-/bincue
 /gnu_linux
 /mmc
 /nrg

test/driver/Makefile.am

@@ -19,6 +19,9 @@ DATA_DIR = $(abs_top_srcdir)/test/data
 bincue_LDADD     = $(LIBCDIO_LIBS) $(LTLIBICONV)
 bincue_CFLAGS    = -DDATA_DIR=\"$(DATA_DIR)\"
 
+cdrdao_LDADD     = $(LIBCDIO_LIBS) $(LTLIBICONV)
+cdrdao_CFLAGS    = -DDATA_DIR=\"$(DATA_DIR)\"
+
 freebsd_LDADD    = $(LIBCDIO_LIBS) $(LTLIBICONV)
 freebsd_CFLAGS   = -DDATA_DIR=\"$(DATA_DIR)\"
 
@@ -44,13 +47,14 @@ win32_LDADD      = $(LIBCDIO_LIBS) $(LTLIBICONV)
 win32_CFLAGS     = -DDATA_DIR=\"$(DATA_DIR)\"
 
 check_PROGRAMS   = \
-	bincue freebsd gnu_linux mmc nrg \
+	bincue cdrdao freebsd gnu_linux mmc nrg \
 	osx realpath solaris win32
 
 TESTS = $(check_PROGRAMS)
 
 EXTRA_DIST = \
 	bincue.c.in \
+	cdrdao.c.in \
 	nrg.c.in
 
 MOSTLYCLEANFILES = \

test/driver/cdrdao.c.in

@@ -1,7 +1,5 @@
 /*
-  $Id: testtoc.c,v 1.9 2008/03/22 18:08:25 karl Exp $
+  Copyright (C) 2004, 2008, 2010 Rocky Bernstein <rocky@gnu.org>
-
-  Copyright (C) 2004, 2008 Rocky Bernstein <rocky@gnu.org>
   
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -38,7 +36,7 @@
 #include <string.h>
 
 #ifndef DATA_DIR
-#define DATA_DIR "./data/"
+#define DATA_DIR "@abs_top_srcdir@/test/data"
 #endif
 
 #define NUM_GOOD_TOCS 16
@@ -79,6 +77,10 @@ main(int argc, const char *argv[])
   unsigned int i;
   char psz_tocfile[500];
 
+#ifdef HAVE_CHDIR
+      if (0 == chdir(DATA_DIR))
+#endif
+      {
 	  psz_tocfile[sizeof(psz_tocfile)-1] = '\0';
   
 	  cdio_loglevel_default = (argc > 1) ? CDIO_LOG_DEBUG : CDIO_LOG_INFO;
@@ -108,6 +110,7 @@ main(int argc, const char *argv[])
 		  break;
 	      }
 	  }
+      }
   
   return ret;
 }