svn commit: r264487 - head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf

[Mark Johnston]

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