From owner-svn-src-all@FreeBSD.ORG Wed Nov 17 20:21:11 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F37E41065670; Wed, 17 Nov 2010 20:21:10 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E194B8FC1F; Wed, 17 Nov 2010 20:21:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAHKLA0X003236; Wed, 17 Nov 2010 20:21:10 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAHKLAdR003234; Wed, 17 Nov 2010 20:21:10 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201011172021.oAHKLAdR003234@svn.freebsd.org> From: Jilles Tjoelker Date: Wed, 17 Nov 2010 20:21:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215440 - stable/7/tools/regression/lib/libc/gen X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Nov 2010 20:21:11 -0000 Author: jilles Date: Wed Nov 17 20:21:10 2010 New Revision: 215440 URL: http://svn.freebsd.org/changeset/base/215440 Log: MFC r174692: Fix wordexp() testsuite. Original commit by das. Modified: stable/7/tools/regression/lib/libc/gen/test-wordexp.c Directory Properties: stable/7/tools/regression/lib/libc/ (props changed) Modified: stable/7/tools/regression/lib/libc/gen/test-wordexp.c ============================================================================== --- stable/7/tools/regression/lib/libc/gen/test-wordexp.c Wed Nov 17 19:54:01 2010 (r215439) +++ stable/7/tools/regression/lib/libc/gen/test-wordexp.c Wed Nov 17 20:21:10 2010 (r215440) @@ -45,7 +45,7 @@ main(int argc, char *argv[]) int r; /* Test that the macros are there. */ - (void)(WRDE_APPEND + WRDE_DOOFS + WRDE_NOCMD + WRDE_REUSE + + (void)(WRDE_APPEND + WRDE_DOOFFS + WRDE_NOCMD + WRDE_REUSE + WRDE_SHOWERR + WRDE_UNDEF); (void)(WRDE_BADCHAR + WRDE_BADVAL + WRDE_CMDSUB + WRDE_NOSPACE + WRDE_SYNTAX); @@ -59,9 +59,9 @@ main(int argc, char *argv[]) assert(we.we_wordv[2] == NULL); wordfree(&we); - /* WRDE_DOOFS */ + /* WRDE_DOOFFS */ we.we_offs = 3; - r = wordexp("hello world", &we, WRDE_DOOFS); + r = wordexp("hello world", &we, WRDE_DOOFFS); assert(r == 0); assert(we.we_wordc == 2); assert(we.we_wordv[0] == NULL); @@ -95,13 +95,13 @@ main(int argc, char *argv[]) assert(we.we_wordv[4] == NULL); wordfree(&we); - /* WRDE_DOOFS + WRDE_APPEND */ + /* WRDE_DOOFFS + WRDE_APPEND */ we.we_offs = 2; - r = wordexp("this is", &we, WRDE_DOOFS); + r = wordexp("this is", &we, WRDE_DOOFFS); assert(r == 0); - r = wordexp("a test", &we, WRDE_APPEND|WRDE_DOOFS); + r = wordexp("a test", &we, WRDE_APPEND|WRDE_DOOFFS); assert(r == 0); - r = wordexp("of wordexp", &we, WRDE_APPEND|WRDE_DOOFS); + r = wordexp("of wordexp", &we, WRDE_APPEND|WRDE_DOOFFS); assert(r == 0); assert(we.we_wordc == 6); assert(we.we_wordv[0] == NULL);