cygwin fixes.

This commit is contained in:
R. Bernstein
2010-01-21 03:48:13 -05:00
parent 2b4a36f758
commit e889ba3557
5 changed files with 14 additions and 6 deletions

View File

@@ -101,5 +101,11 @@ test: check-am
check-am: make-executable
make-executable: check_nrg.sh check_cue.sh check_paranoia.sh
chmod +x *.sh
if test ! -f cdda.bin ; then $(LN_S) $(abs_top_srcdir)/test/data/cdda.bin cdda.bin ; fi
if test ! -f isofs-m1.bin ; then $(LN_S) $(abs_top_srcdir)/test/data/isofs-m1.bin isofs-m1.bin ; fi
if test ! -f cdda.bin ; then \
test -L cdda.bin && $(RM) cdda.bin ; \
$(LN_S) $(abs_top_srcdir)/test/data/cdda.bin cdda.bin ; \
fi
if test ! -f isofs-m1.bin ; then \
test -L cdda.bin && $(RM) isofs-m1.bin ; \
$(LN_S) $(abs_top_srcdir)/test/data/isofs-m1.bin isofs-m1.bin ; \
fi

View File

@@ -1 +1 @@
/src/external-vcs/libcdio/test/data/cdda.bin
/home/rocky/src/external-vcs/libcdio/test/data/cdda.bin

View File

@@ -36,7 +36,7 @@
#include <string.h>
#ifndef DATA_DIR
#define DATA_DIR "/src/external-vcs/libcdio/test/data"
#define DATA_DIR "/home/rocky/src/external-vcs/libcdio/test/data"
#endif
#define NUM_GOOD_CUES 2

View File

@@ -759,7 +759,9 @@ main(int argc, const char *argv[])
exit(1);
}
if (psz_have_mmc && 0 == strncmp("true", psz_have_mmc, sizeof("true"))) {
if ( psz_have_mmc
&& 0 == strncmp("true", psz_have_mmc, sizeof("true"))
&& (DRIVER_WIN32 != cdio_get_driver_id(p_cdio)) ) {
scsi_tuple = cdio_get_arg(p_cdio, "scsi-tuple");
if (scsi_tuple == NULL) {
fprintf(stderr, "cdio_get_arg(\"scsi-tuple\") returns NULL.\n");

View File

@@ -1 +1 @@
/src/external-vcs/libcdio/test/data/isofs-m1.bin
/home/rocky/src/external-vcs/libcdio/test/data/isofs-m1.bin