Adapted from patches by Nicolas Boullis on Debian:

* alignment issues on sparc
 * "make check" failure when stderr is not a tty
 * wrong program name in manpages in tarball
 * build failure with hurd
 * "make check" failure on machines with no disc drive
 * make distclean fixes
This commit is contained in:
R. Bernstein
2009-07-02 20:26:39 -04:00
parent e7ac0ea72c
commit 2522c26ec8
15 changed files with 84 additions and 1407 deletions

View File

@@ -90,7 +90,7 @@ check_DATA = vcd_demo.right vcd_demo_vcdinfo.right \
EXTRA_DIST = $(check_SCRIPTS) $(check_DATA) \
check_common_fn check_cue.sh.in check_nrg.sh.in \
testbincue.c.in testpregap.c.in testnrg.c.in \
check_iso.sh.in p1.bin p1.cue p1.nrg
testgetdevices.c.in check_iso.sh.in p1.bin p1.cue p1.nrg
TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
XFAIL_TESTS = testassert

View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2008, 2009 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,9 +38,17 @@
#ifdef HAVE_SYS_UTSNAME_H
#include <sys/utsname.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <string.h>
#ifndef TEST_DIR
#define TEST_DIR "@srcdir@"
#endif
static void
log_handler (cdio_log_level_t level, const char message[])
{
@@ -146,34 +154,37 @@ main(int argc, const char *argv[])
exit(77);
}
nrg_images = cdio_get_devices(DRIVER_NRG);
for (imgs=nrg_images; *imgs != NULL; imgs++) {
printf("NRG image %s\n", *imgs);
}
if (!is_in(nrg_images, nrg_files[0])) {
cdio_free_device_list(nrg_images);
return 10;
}
bincue_images = cdio_get_devices(DRIVER_BINCUE);
for (imgs=bincue_images; *imgs != NULL; imgs++) {
printf("bincue image %s\n", *imgs);
}
for (i=0; i<2; i++) {
if (is_in(bincue_images, cue_files[i])) {
printf("%s parses as a CDRWIN BIN/CUE csheet.\n", cue_files[i]);
} else {
printf("%s doesn't parse as a CDRWIN BIN/CUE csheet.\n", cue_files[i]);
ret = i+1;
}
}
if (ret != 0) return ret;
if (0 == chdir(TEST_DIR)) {
nrg_images = cdio_get_devices(DRIVER_NRG);
for (imgs=nrg_images; *imgs != NULL; imgs++) {
printf("NRG image %s\n", *imgs);
}
if (!is_in(nrg_images, nrg_files[0])) {
cdio_free_device_list(nrg_images);
return 10;
}
for (i=0; i<2; i++) {
if (is_in(bincue_images, cue_files[i])) {
printf("%s parses as a CDRWIN BIN/CUE csheet.\n", cue_files[i]);
} else {
printf("%s doesn't parse as a CDRWIN BIN/CUE csheet.\n", cue_files[i]);
ret = i+1;
}
}
}
cdio_free_device_list(nrg_images);
cdio_free_device_list(bincue_images);
return 0;