>From 0ba224ec5cd102773086137b7097ec91d1538e49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <address@hidden>
Date: Fri, 31 Oct 2014 02:25:02 +0000
Subject: [PATCH] tests: ln/hard-to-sym FAIL rather than ERROR when ln fails

* tests/ln/hard-to-sym.sh: Only call framework_failure_ when ln
returns success.
---
 tests/ln/hard-to-sym.sh |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/tests/ln/hard-to-sym.sh b/tests/ln/hard-to-sym.sh
index 995d3cf..f3ac8ba 100755
--- a/tests/ln/hard-to-sym.sh
+++ b/tests/ln/hard-to-sym.sh
@@ -29,24 +29,30 @@ ln -s -L -P symlink2 symlink3 || fail=1
 
 # ===================================================
 # ensure that -L follows symlinks, and overrides -P
-ln -P -L symlink3 hard-to-a || fail=1
-ls=$(ls -lG hard-to-a)x
-case "$ls" in
-  *'hard-to-ax') ;;
-  *'hard-to-a -> '*x) fail=1 ;;
-  *) framework_failure_ ;;
-esac
+if ln -P -L symlink3 hard-to-a; then
+  ls=$(ls -lG hard-to-a)x
+  case "$ls" in
+    *'hard-to-ax') ;;
+    *'hard-to-a -> '*x) fail=1 ;;
+    *) framework_failure_ ;;
+  esac
+else
+  fail=1
+fi
 
 # ===================================================
 # ensure that -P links (or at least duplicates) symlinks, and overrides -L
-ln -L -P symlink3 hard-to-3 || fail=1
-ls=$(ls -lG hard-to-3)x
-case "$ls" in
-  *'hard-to-3 -> symlink2x') ;;
-  *'hard-to-3x') fail=1 ;;
-  *'hard-to-3 -> '*x) fail=1 ;;
-  *) framework_failure_ ;;
-esac
+if ln -L -P symlink3 hard-to-3; then
+  ls=$(ls -lG hard-to-3)x
+  case "$ls" in
+    *'hard-to-3 -> symlink2x') ;;
+    *'hard-to-3x') fail=1 ;;
+    *'hard-to-3 -> '*x) fail=1 ;;
+    *) framework_failure_ ;;
+  esac
+else
+  fail=1
+fi
 
 # ===================================================
 # Create a hard link to a dangling symlink.
-- 
1.7.7.6