From owner-svn-src-head@freebsd.org Thu Apr 20 11:32:19 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A8ABED471C4; Thu, 20 Apr 2017 11:32:19 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5EE40F78; Thu, 20 Apr 2017 11:32:19 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3KBWINn057597; Thu, 20 Apr 2017 11:32:18 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3KBWInA057594; Thu, 20 Apr 2017 11:32:18 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201704201132.v3KBWInA057594@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 20 Apr 2017 11:32:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r317187 - head/usr.bin/diff/tests X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2017 11:32:19 -0000 Author: bapt Date: Thu Apr 20 11:32:18 2017 New Revision: 317187 URL: https://svnweb.freebsd.org/changeset/base/317187 Log: Add a regression test for diff -D Added: head/usr.bin/diff/tests/ifdef.out (contents, props changed) Modified: head/usr.bin/diff/tests/Makefile head/usr.bin/diff/tests/diff_test.sh Modified: head/usr.bin/diff/tests/Makefile ============================================================================== --- head/usr.bin/diff/tests/Makefile Thu Apr 20 09:05:53 2017 (r317186) +++ head/usr.bin/diff/tests/Makefile Thu Apr 20 11:32:18 2017 (r317187) @@ -21,7 +21,8 @@ ${PACKAGE}FILES+= \ unified_c9999.out \ unified_9999.out \ header.out \ - header_ns.out + header_ns.out \ + ifdef.out NETBSD_ATF_TESTS_SH+= netbsd_diff_test Modified: head/usr.bin/diff/tests/diff_test.sh ============================================================================== --- head/usr.bin/diff/tests/diff_test.sh Thu Apr 20 09:05:53 2017 (r317186) +++ head/usr.bin/diff/tests/diff_test.sh Thu Apr 20 11:32:18 2017 (r317187) @@ -4,6 +4,7 @@ atf_test_case simple atf_test_case unified atf_test_case header atf_test_case header_ns +atf_test_case ifdef simple_body() { @@ -70,10 +71,18 @@ header_ns_body() diff -u empty hello } +ifdef_body() +{ + atf_check -o file:$(atf_get_srcdir)/ifdef.out -s eq:1 \ + diff -D PLOP "$(atf_get_srcdir)/input_c1.in" \ + "$(atf_get_srcdir)/input_c2.in" +} + atf_init_test_cases() { atf_add_test_case simple atf_add_test_case unified atf_add_test_case header atf_add_test_case header_ns + atf_add_test_case ifdef } Added: head/usr.bin/diff/tests/ifdef.out ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.bin/diff/tests/ifdef.out Thu Apr 20 11:32:18 2017 (r317187) @@ -0,0 +1,26 @@ +/* + * A comment + * +#ifndef PLOP + * And another bla +#else /* PLOP */ + * And another bla +#endif /* PLOP */ + * +#ifndef PLOP + * And yet another +#else /* PLOP */ + * and yet another +#endif /* PLOP */ + */ + +int +main(void) +{ +#ifdef PLOP + +#endif /* PLOP */ + printf("something"); + + return (0); +}