From 041721c060b9092d501ad69715d26f5b9cd4a84d Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Fri, 7 May 2004 02:15:49 +0000
Subject: [PATCH] Error reporting improved to make debugging easier.

---
 test/check_cd_read.sh | 14 +++++++-------
 test/check_iso.sh.in  | 14 +++++++-------
 test/check_opts.sh    |  8 ++++----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/test/check_cd_read.sh b/test/check_cd_read.sh
index f462c323..76b3ef39 100755
--- a/test/check_cd_read.sh
+++ b/test/check_cd_read.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#$Id: check_cd_read.sh,v 1.5 2003/09/21 18:43:36 rocky Exp $
+#$Id: check_cd_read.sh,v 1.6 2004/05/07 02:15:49 rocky Exp $
 #
 #    Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
 #
@@ -33,17 +33,17 @@ BASE=`basename $0 .sh`
 
 fname=cdda
 testnum=CD-DA
-test_cd_read "-c ${srcdir}/${fname}.cue --mode=red --start=0" \
-  ${fname}-read.dump ${srcdir}/${fname}-read.right
+opts="-c ${srcdir}/${fname}.cue --mode=red --start=0"
+test_cd_read  "$opts" ${fname}-read.dump ${srcdir}/${fname}-read.right
 RC=$?
-check_result $RC "cd-read CUE test $testnum"
+check_result $RC "cd-read CUE test $testnum" "cd-read $opts"
 
 fname=isofs-m1
 testnum=MODE1
-test_cd_read "-i ${srcdir}/${fname}.cue --mode m1f1 -s 26 -n 2" \
-  ${fname}-read.dump ${srcdir}/${fname}-read.right
+opts="-i ${srcdir}/${fname}.cue --mode m1f1 -s 26 -n 2"
+test_cd_read "$opts" ${fname}-read.dump ${srcdir}/${fname}-read.right
 RC=$?
-check_result $RC "cd-read CUE test $testnum"
+check_result $RC "cd-read CUE test $testnum" "cd-read $opts"
 
 exit $RC
 
diff --git a/test/check_iso.sh.in b/test/check_iso.sh.in
index db7b1552..3ef509f9 100644
--- a/test/check_iso.sh.in
+++ b/test/check_iso.sh.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-#$Id: check_iso.sh.in,v 1.2 2004/02/29 15:42:30 rocky Exp $
+#$Id: check_iso.sh.in,v 1.3 2004/05/07 02:15:52 rocky Exp $
 
 if test -z $srcdir ; then
   srcdir=`pwd`
@@ -14,15 +14,15 @@ fi
 BASE=`basename $0 .sh`
 fname=copying
 
-test_iso_info "--quiet ${srcdir}/${fname}.iso --iso9660 " \
-  ${fname}.dump ${srcdir}/${fname}.right
+opts="--quiet ${srcdir}/${fname}.iso --iso9660 "
+test_iso_info  "$opts" ${fname}.dump ${srcdir}/${fname}.right
 RC=$?
-check_result $RC 'iso-info test 1'
+check_result $RC 'iso-info test 1' "iso-info $opts"
 
-test_iso_read "--image ${srcdir}/${fname}.iso --extract $fname " \
-  ${fname} ${srcdir}/../COPYING
+opts="--image ${srcdir}/${fname}.iso --extract $fname "
+test_iso_read  "$opts" ${fname} ${srcdir}/../COPYING
 RC=$?
-check_result $RC 'iso-read test 1'
+check_result $RC 'iso-read test 1' "iso-read $opts"
 
 exit $RC
 
diff --git a/test/check_opts.sh b/test/check_opts.sh
index f5bbff12..d1b116bf 100755
--- a/test/check_opts.sh
+++ b/test/check_opts.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#$Id: check_opts.sh,v 1.5 2003/10/06 04:04:05 rocky Exp $
+#$Id: check_opts.sh,v 1.6 2004/05/07 02:15:56 rocky Exp $
 # Check cd-info options
 if test -z "$srcdir" ; then
   srcdir=`pwd`
@@ -18,10 +18,10 @@ i=0
 for opt in '-T' '--no-tracks' '-A' '--no-analyze' '-I' '--no-ioctl' \
       '-q' '--quiet' ; do 
   testname=${BASE}$i
-  test_cdinfo "--cue-file ${srcdir}/${fname}.cue $opt --quiet" \
-    ${testname}.dump ${srcdir}/${testname}.right
+  opts="--cue-file ${srcdir}/${fname}.cue $opt --quiet"
+  test_cdinfo  "$opts" ${testname}.dump ${srcdir}/${testname}.right
   RC=$?
-  check_result $RC "cd-info option test $opt"
+  check_result $RC "cd-info option test $opt" "cd-info $opts"
   i=`expr $i + 1`
 done