From af0a57856e7cd029e01f1f00694409f2f0356742 Mon Sep 17 00:00:00 2001 From: "R. Bernstein" Date: Sun, 4 Mar 2012 00:30:58 -0500 Subject: [PATCH] test/check_udf.sh works when building outside source tree. With this "make distcheck" should work again --- configure.ac | 1 + test/.gitignore | 2 +- test/check_udf.sh | 8 +++---- test/check_udf.sh.in | 54 +++++++++++++++++++++++++++++++++++++++++++ test/data/Makefile.am | 3 ++- 5 files changed, 62 insertions(+), 6 deletions(-) create mode 100755 test/check_udf.sh.in diff --git a/configure.ac b/configure.ac index b4c306f4..1d59375f 100644 --- a/configure.ac +++ b/configure.ac @@ -670,6 +670,7 @@ AC_CONFIG_FILES([ AC_CONFIG_FILES([test/check_cue.sh], [chmod +x test/check_cue.sh]) AC_CONFIG_FILES([test/check_iso.sh], [chmod +x test/check_iso.sh]) AC_CONFIG_FILES([test/check_nrg.sh], [chmod +x test/check_nrg.sh]) +AC_CONFIG_FILES([test/check_udf.sh], [chmod +x test/check_udf.sh]) AC_OUTPUT AC_MSG_NOTICE([ diff --git a/test/.gitignore b/test/.gitignore index 0f1af53f..dc7d470c 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -16,8 +16,8 @@ /check_cue.sh /check_iso.sh /check_nrg.sh -/check_paranoia.sh /check_sizeof +/check_udf.sh /isofs-m1.bin /test_lib_driver_util /testassert diff --git a/test/check_udf.sh b/test/check_udf.sh index ae315370..58b365ed 100755 --- a/test/check_udf.sh +++ b/test/check_udf.sh @@ -16,12 +16,12 @@ # # Tests to see that CD reading is correct (via cd-read). -if test -z $srcdir ; then - srcdir=`pwd` +if test "X$abs_top_srcdir" = "X" ; then + abs_top_srcdir=/src/external-vcs/libcdio fi if test "X$top_builddir" = "X" ; then - top_builddir=`pwd`/.. + top_builddir=/src/external-vcs/libcdio fi if test ! -x $top_builddir/example/extract ; then @@ -35,7 +35,7 @@ if test -d $extract_dir ; then rm -fr $extract_dir fi -udf_iso=$srcdir/data/test-udf1.iso +udf_iso=$abs_top_srcdir/test/data/test-udf1.iso extract_program=$top_builddir/example/extract cmd="$extract_program $udf_iso $extract_dir" $cmd diff --git a/test/check_udf.sh.in b/test/check_udf.sh.in new file mode 100755 index 00000000..31495278 --- /dev/null +++ b/test/check_udf.sh.in @@ -0,0 +1,54 @@ +#!/bin/sh +# Copyright (C) 2012 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# Tests to see that CD reading is correct (via cd-read). + +if test "X$abs_top_srcdir" = "X" ; then + abs_top_srcdir=@abs_top_srcdir@ +fi + +if test "X$top_builddir" = "X" ; then + top_builddir=@abs_top_builddir@ +fi + +if test ! -x $top_builddir/example/extract ; then + exit 77 +fi + +. ${top_builddir}/test/check_common_fn + +extract_dir=/tmp/udf-$$ +if test -d $extract_dir ; then + rm -fr $extract_dir +fi + +udf_iso=$abs_top_srcdir/test/data/test-udf1.iso +extract_program=$top_builddir/example/extract +cmd="$extract_program $udf_iso $extract_dir" +$cmd +RC=$? +check_result $RC "$cmd" + +if test $RC -eq 0 ; then + rm -fr $extract_dir +fi + +exit $RC + +#;;; Local Variables: *** +#;;; mode:shell-script *** +#;;; eval: (sh-set-shell "bash") *** +#;;; End: *** diff --git a/test/data/Makefile.am b/test/data/Makefile.am index 61a7d969..9955e9c6 100644 --- a/test/data/Makefile.am +++ b/test/data/Makefile.am @@ -47,6 +47,7 @@ check_DATA = \ cdtext.toc \ data5.toc \ data6.toc \ - data7.toc + data7.toc \ + test-udf1.iso EXTRA_DIST = $(check_DATA)