X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/61342041b52f7a2fc861853b15bde356cd66bfed..fdff28dfb693888c083c47255c784256bede64cb:/tests/moo2data.at

diff --git a/tests/moo2data.at b/tests/moo2data.at
index e47ccf4..326763a 100644
--- a/tests/moo2data.at
+++ b/tests/moo2data.at
@@ -74,19 +74,17 @@ dnl
 dnl Compute and validate the MD5 hash over the plane data from a PAM image.
 dnl Additional arguments specify PAM header fields that should be checked.
 m4_define([TEST_CHECK_PAM_MD5],
-[exec 3<$1; AT_CHECK([pam_check_header <&3 \
-  m4_map_args_sep([m4_apply([m4_car], m4_split(], [))], [ ], m4_shift2($@))
-status=$?
-echo $pam_TUPLTYPE >$1.tt
-exit $?], [0],[m4_map_args([m4_n], m4_shift2($@))])
-AT_CHECK([test_md5sum <&3 >$1.md5])
-exec 3<&-
-
-# For reliable verification of images with transparency, we must have a known
-# constant colour value for transparent pixels.  We can use netpbm tools to
-# zero out those pixels.  For affected image formats, if we cannot normalize
-# the transparent pixels we have to skip the test if verification would fail.
-
+[AT_CHECK([:; { pam_check_header m4_map_args_sep(
+  [m4_apply([m4_car], m4_split(], [))], [ ], m4_shift2($@)) &&
+  echo $pam_TUPLTYPE >$1.tt &&
+  test_md5sum >$1.md5; } <$1], [0], [m4_map_args([m4_n], m4_shift2($@))])
+dnl AT_CHECK([test_md5sum <&3 >$1.md5])
+dnl exec 3<&-
+
+dnl For reliable verification of images with transparency, we must have a known
+dnl constant colour value for transparent pixels.  We can use netpbm tools to
+dnl zero out those pixels.  For affected image formats, if we cannot normalize
+dnl the transparent pixels we have to skip the test if verification would fail.
 md5_reliable=true
 read pam_TUPLTYPE <$1.tt
 AS_CASE([$pam_TUPLTYPE],