From 8b1d6fce229a563b26163ea99cf6cc71a54b7baf Mon Sep 17 00:00:00 2001 From: rocky Date: Fri, 29 Aug 2003 11:10:01 +0000 Subject: [PATCH] Invalid substituiton variable. Allow cd-info tests to be skipped. --- test/check_cue.sh.in | 8 ++++++-- test/check_nrg.sh.in | 8 ++++++-- test/check_opts.sh | 6 +++++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/test/check_cue.sh.in b/test/check_cue.sh.in index 53d28890..8fb98ca3 100644 --- a/test/check_cue.sh.in +++ b/test/check_cue.sh.in @@ -1,10 +1,10 @@ #!/bin/sh -#$Id: check_cue.sh.in,v 1.3 2003/05/18 02:31:59 rocky Exp $ +#$Id: check_cue.sh.in,v 1.4 2003/08/29 11:10:01 rocky Exp $ if test -n "@CDDB_LIB@" ; then cddb_opt='--no-cddb' fi -if test -n "@VCD_LIB@" ; then +if test -n "@VCDINFO_LIBS@" ; then vcd_opt='--no-vcd' fi @@ -14,6 +14,10 @@ fi . ${srcdir}/check_common_fn +if ! test -x ../src/cd-info ; then + exit 77 +fi + BASE=`basename $0 .sh` fname=cdda diff --git a/test/check_nrg.sh.in b/test/check_nrg.sh.in index 37c2fab0..1ee84c87 100755 --- a/test/check_nrg.sh.in +++ b/test/check_nrg.sh.in @@ -1,7 +1,7 @@ #!/bin/sh -#$Id: check_nrg.sh.in,v 1.2 2003/05/16 21:11:18 rocky Exp $ +#$Id: check_nrg.sh.in,v 1.3 2003/08/29 11:10:01 rocky Exp $ -if test -n "@VCDINFO_LIB@" ; then +if test -n "@VCDINFO_LIBS@" ; then vcd_opt='--no-vcd' fi @@ -11,6 +11,10 @@ fi . ${srcdir}/check_common_fn +if ! test -x ../src/cd-info ; then + exit 77 +fi + BASE=`basename $0 .sh` fname=videocd diff --git a/test/check_opts.sh b/test/check_opts.sh index 8c417ec7..a471d51e 100755 --- a/test/check_opts.sh +++ b/test/check_opts.sh @@ -1,5 +1,5 @@ #!/bin/sh -#$Id: check_opts.sh,v 1.2 2003/04/25 21:28:39 rocky Exp $ +#$Id: check_opts.sh,v 1.3 2003/08/29 11:10:01 rocky Exp $ # Check cd-info options if test -z "$srcdir" ; then srcdir=`pwd` @@ -7,6 +7,10 @@ fi . ${srcdir}/check_common_fn +if ! test -x ../src/cd-info ; then + exit 77 +fi + BASE=`basename $0 .sh` fname=isofs-m1