Date: Tue, 20 Dec 2011 20:37:17 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r228750 - head/usr.bin/cpio/test Message-ID: <201112202037.pBKKbHEi034059@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Tue Dec 20 20:37:17 2011 New Revision: 228750 URL: http://svn.freebsd.org/changeset/base/228750 Log: Sync bsdcpio with vendor branch release/2.8: Revision 3770: Merge r3768 from trunk: Fix typo in dev/ino verification for cpio formats. Obtained from: http://code.google.com/p/libarchive MFC after: 2 weeks Modified: head/usr.bin/cpio/test/test_option_c.c Modified: head/usr.bin/cpio/test/test_option_c.c ============================================================================== --- head/usr.bin/cpio/test/test_option_c.c Tue Dec 20 20:36:00 2011 (r228749) +++ head/usr.bin/cpio/test/test_option_c.c Tue Dec 20 20:37:17 2011 (r228750) @@ -176,7 +176,7 @@ DEFINE_TEST(test_option_c) assertEqualInt(dev, from_octal(e + 6, 6)); /* Ino must be different from first entry. */ assert(is_octal(e + 12, 6)); /* ino */ - assert(dev != from_octal(e + 12, 6)); + assert(ino != from_octal(e + 12, 6)); #if defined(_WIN32) && !defined(__CYGWIN__) /* Group members bits and others bits do not work. */ assertEqualMem(e + 18, "040777", 6); /* Mode */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112202037.pBKKbHEi034059>