From 1f41c50b097a80a0650a11d9b1800098a27936f7 Mon Sep 17 00:00:00 2001
From: "R. Bernstein" <rocky@gnu.org>
Date: Tue, 9 Feb 2010 07:49:52 -0500
Subject: [PATCH] sort libcdio.sym. Remove duplicated tests.

---
 lib/driver/libcdio.sym |  3 ++-
 test/driver/mmc.c      | 30 ------------------------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/lib/driver/libcdio.sym b/lib/driver/libcdio.sym
index b222c474..8b2e0d36 100644
--- a/lib/driver/libcdio.sym
+++ b/lib/driver/libcdio.sym
@@ -201,9 +201,9 @@ mmc_feature_profile2str
 mmc_get_blocksize
 mmc_get_cmd_len
 mmc_get_configuration
-mmc_get_disc_erasable
 mmc_get_discmode
 mmc_get_disctype
+mmc_get_disc_erasable
 mmc_get_drive_mmc_cap
 mmc_get_dvd_struct_physical
 mmc_get_event_status
@@ -234,6 +234,7 @@ mmc_sense_key2str
 mmc_set_blocksize
 mmc_set_speed
 mmc_start_stop_unit
+mmc_test_unit_ready
 mmc_timeout_ms
 mmc_test_unit_ready
 track_format2str
diff --git a/test/driver/mmc.c b/test/driver/mmc.c
index 2a916256..fc44eaf1 100644
--- a/test/driver/mmc.c
+++ b/test/driver/mmc.c
@@ -629,28 +629,6 @@ test_write(char *drive_path, unsigned int i_flag)
     printf("Drive '%s' has cdio_get_arg(\"scsi-tuple\") = '%s'\n",
            drive_path, scsi_tuple);
 
-
-  /* Test availability of sense reply in case of unready drive.
-     E.g. if the tray is already ejected.
-  */
-  ret = test_test_unit_ready(p_cdio, &sense_avail, sense, !!verbose);
-  if (ret != 0 && sense_avail < 18) {
-    fprintf(stderr,
-            "Error: Drive not ready. Only %d sense bytes. Expected >= 18.\n",
-            sense_avail);
-    {ret = 2; goto ex;}
-  }
-
-  /* Cause sense reply failure by requesting inappropriate mode page 3Eh */
-  ret = test_mode_sense(p_cdio, &sense_avail, sense,
-                       0x3e, 0, alloc_len, buf, &i_size, !!verbose);
-  if (ret != 0 && sense_avail < 18) {
-    fprintf(stderr,
-            "Error: An illegal command yields only %d sense bytes. Expected >= 18.\n",
-            sense_avail);
-    {ret = 2; goto ex;}
-  } 
-
   /* Test availability of sense reply in case of unready drive.
      E.g. if the tray is already ejected.
   */
@@ -743,7 +721,6 @@ ex:;
 int
 main(int argc, const char *argv[])
 {
-  const char *scsi_tuple;
   CdIo_t *p_cdio;
   char **ppsz_drives=NULL;
   const char *psz_source = NULL;
@@ -787,13 +764,6 @@ main(int argc, const char *argv[])
 	
     if ( psz_have_mmc 
 	 && 0 == strncmp("true", psz_have_mmc, sizeof("true")) ) {
-	scsi_tuple = cdio_get_arg(p_cdio, "scsi-tuple");
-	if (scsi_tuple == NULL) {
-	    fprintf(stderr, "cdio_get_arg(\"scsi-tuple\") returns NULL.\n");
-	    exit(3);
-	} else if (cdio_loglevel_default == CDIO_LOG_DEBUG)
-	    printf("Drive '%s' has cdio_get_arg(\"scsi-tuple\") = '%s'\n",
-		   psz_source, scsi_tuple);
 
 	/* Test the MMC enhancements of version 0.83 in december 2009 */
 	ret = test_write(ppsz_drives[0],