From f180cae22d0bc3cec79340fbc96419554c4357fc Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 26 Dec 2009 17:25:05 +0100 Subject: [PATCH] example/* change failures so the record as skipped tests when running 'make check'. --- example/cdtext.c | 2 +- example/mmc1.c | 6 ++---- example/mmc2.c | 6 ++---- example/mmc2a.c | 6 ++---- example/mmc3.c | 8 +++----- example/paranoia.c | 8 +++----- example/paranoia2.c | 6 +++--- example/sample4.c | 2 +- test/testiso9660.c | 2 -- 9 files changed, 17 insertions(+), 29 deletions(-) diff --git a/example/cdtext.c b/example/cdtext.c index 9b96166f..df17f4d7 100644 --- a/example/cdtext.c +++ b/example/cdtext.c @@ -84,7 +84,7 @@ main(int argc, const char *argv[]) if (NULL == p_cdio) { printf("Couldn't find CD\n"); - return 1; + return 77; } else { print_disc_info(p_cdio, i_tracks, i_first_track); } diff --git a/example/mmc1.c b/example/mmc1.c index 822e1567..58771492 100644 --- a/example/mmc1.c +++ b/example/mmc1.c @@ -1,7 +1,5 @@ /* - $Id: mmc1.c,v 1.7 2008/03/24 15:30:56 karl Exp $ - - Copyright (C) 2004, 2005, 2008 Rocky Bernstein + Copyright (C) 2004, 2005, 2008, 2009 Rocky Bernstein 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 @@ -49,7 +47,7 @@ main(int argc, const char *argv[]) if (!p_cdio) { printf("Couldn't find CD\n"); - return 1; + return 77; } else { int i_status; /* Result of MMC command */ char buf[36] = { 0, }; /* Place to hold returned data */ diff --git a/example/mmc2.c b/example/mmc2.c index 3fcf1a5d..128f66bc 100644 --- a/example/mmc2.c +++ b/example/mmc2.c @@ -1,7 +1,5 @@ /* - $Id: mmc2.c,v 1.8 2008/03/24 15:30:56 karl Exp $ - - Copyright (C) 2004, 2005, 2008 Rocky Bernstein + Copyright (C) 2004, 2005, 2008, 2009 Rocky Bernstein 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 @@ -44,7 +42,7 @@ main(int argc, const char *argv[]) if (NULL == p_cdio) { printf("Couldn't find CD\n"); - return 1; + return 77; } else { int i_status; /* Result of MMC command */ uint8_t buf[500] = { 0, }; /* Place to hold returned data */ diff --git a/example/mmc2a.c b/example/mmc2a.c index 800e04a8..58e39b36 100644 --- a/example/mmc2a.c +++ b/example/mmc2a.c @@ -1,7 +1,5 @@ /* - $Id: mmc2a.c,v 1.5 2008/03/24 15:30:56 karl Exp $ - - Copyright (C) 2006, 2008 Rocky Bernstein + Copyright (C) 2006, 2008, 2009 Rocky Bernstein 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 @@ -209,7 +207,7 @@ main(int argc, const char *argv[]) if (!p_cdio) { printf("Couldn't find CD\n"); - return 1; + return 77; } else { uint8_t buf[22] = { 0, }; /* Place to hold returned data */ char *psz_cd = cdio_get_default_device(p_cdio); diff --git a/example/mmc3.c b/example/mmc3.c index 23f9680a..ac71f0da 100644 --- a/example/mmc3.c +++ b/example/mmc3.c @@ -1,7 +1,5 @@ /* - $Id: mmc3.c,v 1.2 2008/03/24 15:30:56 karl Exp $ - - Copyright (C) 2006, 2008 Rocky Bernstein + Copyright (C) 2006, 2008, 2009 Rocky Bernstein 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 @@ -51,14 +49,14 @@ main(int argc, const char *argv[]) psz_drive = cdio_get_default_device_driver(&driver_id); if (!psz_drive) { printf("Can't find a CD-ROM\n"); - exit(1); + exit(77); } } p_cdio = cdio_open (psz_drive, driver_id); if (!p_cdio) { printf("Can't open %s\n", psz_drive); - exit(2); + exit(77); } ret = mmc_get_tray_status(p_cdio); diff --git a/example/paranoia.c b/example/paranoia.c index 94ba7bb4..f3cdad33 100644 --- a/example/paranoia.c +++ b/example/paranoia.c @@ -1,6 +1,4 @@ /* - $Id: paranoia.c,v 1.9 2008/03/24 15:30:56 karl Exp $ - Copyright (C) 2005, 2006, 2008, 2009 Rocky Bernstein This program is free software: you can redistribute it and/or modify @@ -93,7 +91,7 @@ main(int argc, const char *argv[]) d=cdda_identify(*ppsz_cd_drives, 1, NULL); } else { printf("Unable find or access a CD-ROM drive with an audio CD in it.\n"); - exit(1); + exit(77); } /* Don't need a list of CD's with CD-DA's any more. */ @@ -101,7 +99,7 @@ main(int argc, const char *argv[]) if ( !d ) { printf("Unable to identify audio CD disc.\n"); - exit(1); + exit(77); } /* We'll set for verbose paranoia messages. */ @@ -109,7 +107,7 @@ main(int argc, const char *argv[]) if ( 0 != cdda_open(d) ) { printf("Unable to open disc.\n"); - exit(1); + exit(77); } /* Okay now set up to read up to the first 300 frames of the first diff --git a/example/paranoia2.c b/example/paranoia2.c index b7e2e9f9..19a725b5 100644 --- a/example/paranoia2.c +++ b/example/paranoia2.c @@ -47,7 +47,7 @@ main(int argc, const char *argv[]) d=cdio_cddap_identify_cdio(p_cdio, 1, NULL); } else { printf("Unable find or access a CD-ROM drive with an audio CD in it.\n"); - exit(1); + exit(77); } /* Don't need a list of CD's with CD-DA's any more. */ @@ -55,7 +55,7 @@ main(int argc, const char *argv[]) if ( !d ) { printf("Unable to identify audio CD disc.\n"); - exit(1); + exit(77); } /* We'll set for verbose paranoia messages. */ @@ -63,7 +63,7 @@ main(int argc, const char *argv[]) if ( 0 != cdio_cddap_open(d) ) { printf("Unable to open disc.\n"); - exit(1); + exit(77); } /* In the paranoia example was a reading. Here we are going to do diff --git a/example/sample4.c b/example/sample4.c index 8e0fc16e..c51e16ec 100644 --- a/example/sample4.c +++ b/example/sample4.c @@ -145,7 +145,7 @@ main(int argc, const char *argv[]) if (NULL == p_cdio) { printf("Problem in trying to find a driver.\n\n"); - return 1; + return 77; } first_track_num = cdio_get_first_track_num(p_cdio); diff --git a/test/testiso9660.c b/test/testiso9660.c index ef3fd117..acab0271 100644 --- a/test/testiso9660.c +++ b/test/testiso9660.c @@ -1,6 +1,4 @@ /* - $Id: testiso9660.c,v 1.23 2008/06/03 08:40:15 rocky Exp $ - Copyright (C) 2003, 2006, 2007, 2008, 2009 Rocky Bernstein This program is free software: you can redistribute it and/or modify