Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Dec 2015 21:22:29 +0000 (UTC)
From:      Craig Rodrigues <rodrigc@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r291615 - head/contrib/netbsd-tests/lib/libcrypt
Message-ID:  <201512012122.tB1LMT3w098202@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rodrigc
Date: Tue Dec  1 21:22:29 2015
New Revision: 291615
URL: https://svnweb.freebsd.org/changeset/base/291615

Log:
  Hack test so that it works on FreeBSD.

Modified:
  head/contrib/netbsd-tests/lib/libcrypt/t_crypt.c

Modified: head/contrib/netbsd-tests/lib/libcrypt/t_crypt.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libcrypt/t_crypt.c	Tue Dec  1 21:19:16 2015	(r291614)
+++ head/contrib/netbsd-tests/lib/libcrypt/t_crypt.c	Tue Dec  1 21:22:29 2015	(r291615)
@@ -124,11 +124,13 @@ ATF_TC_HEAD(crypt_salts, tc)
 ATF_TC_BODY(crypt_salts, tc)
 {
 	for (size_t i = 0; tests[i].hash; i++) {
+		char *hash = crypt(tests[i].pw, tests[i].hash);
 #if defined(__FreeBSD__)
-		if (22 <= i)
+		if (i >= 22 && i != 24 && i != 25)
 			atf_tc_expect_fail("Old-style/bad inputs fail on FreeBSD");
+		else
+			atf_tc_expect_pass();
 #endif
-		char *hash = crypt(tests[i].pw, tests[i].hash);
 		if (!hash) {
 			ATF_CHECK_MSG(0, "Test %zu NULL\n", i);
 			continue;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512012122.tB1LMT3w098202>