From owner-svn-src-head@FreeBSD.ORG Tue Apr 15 02:32:01 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C84DEB0E; Tue, 15 Apr 2014 02:32:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 B4DE51A96; Tue, 15 Apr 2014 02:32:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3F2W1LV074065; Tue, 15 Apr 2014 02:32:01 GMT (envelope-from markj@svn.freebsd.org) Received: (from markj@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3F2W0mP074049; Tue, 15 Apr 2014 02:32:00 GMT (envelope-from markj@svn.freebsd.org) Message-Id: <201404150232.s3F2W0mP074049@svn.freebsd.org> From: Mark Johnston Date: Tue, 15 Apr 2014 02:32:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264487 - head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf 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.17 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: Tue, 15 Apr 2014 02:32:02 -0000 Author: markj Date: Tue Apr 15 02:32:00 2014 New Revision: 264487 URL: http://svnweb.freebsd.org/changeset/base/264487 Log: Replace a few Solarisisms with their corresponding FreeBSDisms to make a few printf tests pass. Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d Tue Apr 15 02:28:08 2014 (r264486) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d Tue Apr 15 02:32:00 2014 (r264487) @@ -44,7 +44,7 @@ BEGIN printf("\n"); - printf("%%a = %a\n", &`kmem_alloc); + printf("%%a = %a\n", &`malloc); printf("%%c = %c\n", i); printf("%%d = %d\n", i); printf("%%hd = %hd\n", (short)i); Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out Tue Apr 15 02:28:08 2014 (r264486) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out Tue Apr 15 02:32:00 2014 (r264487) @@ -1,5 +1,5 @@ -%a = genunix`kmem_alloc +%a = kernel`malloc %c = a %d = 97 %hd = 97 Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d Tue Apr 15 02:28:08 2014 (r264486) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d Tue Apr 15 02:32:00 2014 (r264487) @@ -36,6 +36,6 @@ BEGIN { - printf("sysname = %s", `utsname.sysname); + printf("sysname = %s", `ostype); exit(0); } Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out Tue Apr 15 02:28:08 2014 (r264486) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out Tue Apr 15 02:32:00 2014 (r264487) @@ -1 +1 @@ -sysname = SunOS +sysname = FreeBSD Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d Tue Apr 15 02:28:08 2014 (r264486) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d Tue Apr 15 02:32:00 2014 (r264487) @@ -38,6 +38,6 @@ BEGIN { - printf("symbol = %a", &`kmem_alloc); + printf("symbol = %a", &`malloc); exit(0); } Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out Tue Apr 15 02:28:08 2014 (r264486) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out Tue Apr 15 02:32:00 2014 (r264487) @@ -1 +1 @@ -symbol = kernel`kmem_alloc +symbol = kernel`malloc