From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 24 Jan 2013 21:49:17 +0000 (-0800)
Subject: Fix test script error codes
X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=commitdiff_plain;h=563103decdca7c06850ca0909e5c8f8b4b0c0fe5;p=zfs.git

Fix test script error codes

The 'exit $?' command in the INT TERM EXIT trap was overwritting
the expected error code with the error code from mv.  Fix the
issue by removing the 'exit $?'.  It's important the we preserve
the original error code so failures are easily noticed.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
---

diff --git a/scripts/common.sh.in b/scripts/common.sh.in
index 3c11820..f087f44 100644
--- a/scripts/common.sh.in
+++ b/scripts/common.sh.in
@@ -124,7 +124,7 @@ init() {
 	# set to ensure the udev rule is correctly replaced on exit.
 	local RULE=${udevruledir}/90-zfs.rules
 	if test -e  ${RULE}; then
-		trap "mv ${RULE}.disabled ${RULE}; exit $?" INT TERM EXIT
+		trap "mv ${RULE}.disabled ${RULE}" INT TERM EXIT
 		mv ${RULE} ${RULE}.disabled
 	fi
 }