From: Mark Andrews <marka@isc.org>
Date: Tue, 18 Nov 2014 01:19:37 +0000 (+1100)
Subject: only execute additional tests if create call succeeds
X-Git-Tag: v9.11.0a1~1260
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=4ac862fa965ef95a9676d8d90a5b1ada920fdd6e;p=thirdparty%2Fbind9.git

only execute additional tests if create call succeeds
---

diff --git a/lib/isc/tests/file_test.c b/lib/isc/tests/file_test.c
index b252b50580e..5caed66b2ab 100644
--- a/lib/isc/tests/file_test.c
+++ b/lib/isc/tests/file_test.c
@@ -59,17 +59,21 @@ ATF_TC_BODY(isc_file_sanitize, tc) {
 
 	fd = creat(F(TRUNC_SHA), 0644);
 	ATF_CHECK(fd != -1);
-	result = isc_file_sanitize("testdata/file", NAME, "test", buf, 1024);
-	ATF_CHECK_EQ(result, ISC_R_SUCCESS);
-	ATF_CHECK(strcmp(buf, F(TRUNC_SHA)) == 0);
-	close(fd);
+	if (fd != -1) {
+		result = isc_file_sanitize("testdata/file", NAME, "test", buf, 1024);
+		ATF_CHECK_EQ(result, ISC_R_SUCCESS);
+		ATF_CHECK(strcmp(buf, F(TRUNC_SHA)) == 0);
+		close(fd);
+	}
 
 	fd = creat(F(SHA), 0644);
 	ATF_CHECK(fd != -1);
-	result = isc_file_sanitize("testdata/file", NAME, "test", buf, 1024);
-	ATF_CHECK_EQ(result, ISC_R_SUCCESS);
-	ATF_CHECK(strcmp(buf, F(SHA)) == 0);
-	close(fd);
+	if (fd != -1) {
+		result = isc_file_sanitize("testdata/file", NAME, "test", buf, 1024);
+		ATF_CHECK_EQ(result, ISC_R_SUCCESS);
+		ATF_CHECK(strcmp(buf, F(SHA)) == 0);
+		close(fd);
+	}
 
 	result = isc_file_sanitize("testdata/file", BAD1, "test", buf, 1024);
 	ATF_CHECK_EQ(result, ISC_R_SUCCESS);