From e98619c71c6c29df1f4cacb5db954944118472ca Mon Sep 17 00:00:00 2001
From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Mon, 16 Mar 2009 22:52:47 +0000
Subject: [PATCH] Make sure tests fail by exiting a non nul value.

---
 tests/convtools/06_grpconv_error_group_locked/grpconv.test      | 2 +-
 tests/convtools/07_grpconv_error_gshadow_locked/grpconv.test    | 2 +-
 tests/convtools/09_grpunconv_error_group_locked/grpunconv.test  | 2 +-
 .../convtools/10_grpunconv_error_gshadow_locked/grpunconv.test  | 2 +-
 tests/convtools/11_pwconv_error_passwd_locked/pwconv.test       | 2 +-
 tests/convtools/12_pwconv_error_shadow_locked/pwconv.test       | 2 +-
 tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test   | 2 +-
 tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/convtools/06_grpconv_error_group_locked/grpconv.test b/tests/convtools/06_grpconv_error_group_locked/grpconv.test
index 0fdba32c..bd9f46f6 100755
--- a/tests/convtools/06_grpconv_error_group_locked/grpconv.test
+++ b/tests/convtools/06_grpconv_error_group_locked/grpconv.test
@@ -21,7 +21,7 @@ touch /etc/group.lock
 echo "done"
 
 echo -n "Convert the group files (grpconv)..."
-grpconv 2>tmp/grpconv.err && exit || {
+grpconv 2>tmp/grpconv.err && exit 1 || {
 	status=$?
 }
 echo "OK"
diff --git a/tests/convtools/07_grpconv_error_gshadow_locked/grpconv.test b/tests/convtools/07_grpconv_error_gshadow_locked/grpconv.test
index 48f512d1..f8fc2bab 100755
--- a/tests/convtools/07_grpconv_error_gshadow_locked/grpconv.test
+++ b/tests/convtools/07_grpconv_error_gshadow_locked/grpconv.test
@@ -21,7 +21,7 @@ touch /etc/gshadow.lock
 echo "done"
 
 echo -n "Convert the group files (grpconv)..."
-grpconv 2>tmp/grpconv.err && exit || {
+grpconv 2>tmp/grpconv.err && exit 1 || {
 	status=$?
 }
 echo "OK"
diff --git a/tests/convtools/09_grpunconv_error_group_locked/grpunconv.test b/tests/convtools/09_grpunconv_error_group_locked/grpunconv.test
index c27d5247..40001de0 100755
--- a/tests/convtools/09_grpunconv_error_group_locked/grpunconv.test
+++ b/tests/convtools/09_grpunconv_error_group_locked/grpunconv.test
@@ -21,7 +21,7 @@ touch /etc/group.lock
 echo "done"
 
 echo -n "Convert the group files (grpunconv)..."
-grpunconv 2>tmp/grpunconv.err && exit || {
+grpunconv 2>tmp/grpunconv.err && exit 1 || {
 	status=$?
 }
 echo "OK"
diff --git a/tests/convtools/10_grpunconv_error_gshadow_locked/grpunconv.test b/tests/convtools/10_grpunconv_error_gshadow_locked/grpunconv.test
index ff1f9282..4d58a869 100755
--- a/tests/convtools/10_grpunconv_error_gshadow_locked/grpunconv.test
+++ b/tests/convtools/10_grpunconv_error_gshadow_locked/grpunconv.test
@@ -21,7 +21,7 @@ touch /etc/gshadow.lock
 echo "done"
 
 echo -n "Convert the group files (grpunconv)..."
-grpunconv 2>tmp/grpunconv.err && exit || {
+grpunconv 2>tmp/grpunconv.err && exit 1 || {
 	status=$?
 }
 echo "OK"
diff --git a/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test b/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test
index 1c0b4f24..db0ca536 100755
--- a/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test
+++ b/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test
@@ -21,7 +21,7 @@ touch /etc/passwd.lock
 echo "done"
 
 echo -n "Convert the passwd files (pwconv)..."
-pwconv 2>tmp/pwconv.err && exit || {
+pwconv 2>tmp/pwconv.err && exit 1 || {
 	status=$?
 }
 echo "OK"
diff --git a/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test b/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test
index 0f16b430..5f3fecf5 100755
--- a/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test
+++ b/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test
@@ -21,7 +21,7 @@ touch /etc/shadow.lock
 echo "done"
 
 echo -n "Convert the shadow files (pwconv)..."
-pwconv 2>tmp/pwconv.err && exit || {
+pwconv 2>tmp/pwconv.err && exit 1 || {
 	status=$?
 }
 echo "OK"
diff --git a/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test b/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test
index d75e28c8..f66245e8 100755
--- a/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test
+++ b/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test
@@ -21,7 +21,7 @@ touch /etc/passwd.lock
 echo "done"
 
 echo -n "Convert the passwd files (pwunconv)..."
-pwunconv 2>tmp/pwunconv.err && exit || {
+pwunconv 2>tmp/pwunconv.err && exit 1 || {
 	status=$?
 }
 echo "OK"
diff --git a/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test b/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test
index 86472db8..be91a500 100755
--- a/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test
+++ b/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test
@@ -21,7 +21,7 @@ touch /etc/shadow.lock
 echo "done"
 
 echo -n "Convert the shadow files (pwunconv)..."
-pwunconv 2>tmp/pwunconv.err && exit || {
+pwunconv 2>tmp/pwunconv.err && exit 1 || {
 	status=$?
 }
 echo "OK"