Date: Fri, 24 Nov 2017 19:57:13 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326181 - in head/cddl: contrib/opensolaris/cmd/dtrace/test/tst/common/uctf usr.sbin/dtrace/tests/common/probes usr.sbin/dtrace/tests/common/speculation usr.sbin/dtrace/tests/common/uct... Message-ID: <201711241957.vAOJvDfO088977@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Fri Nov 24 19:57:13 2017 New Revision: 326181 URL: https://svnweb.freebsd.org/changeset/base/326181 Log: Compile one of the uctf test programs with -m32. The err.user64mode.ksh test expects it to run as a 32-bit process. MFC after: 1 week Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh ============================================================================== --- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh Fri Nov 24 19:38:59 2017 (r326180) +++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh Fri Nov 24 19:57:13 2017 (r326181) @@ -38,7 +38,7 @@ fi ./$exe & pid=$! -$dtrace -qs /dev/stdin <<EOF +$dtrace -32 -qs /dev/stdin <<EOF typedef struct info { char *zi_gamename; int zi_ndungeons; Modified: head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile Fri Nov 24 19:38:59 2017 (r326180) +++ head/cddl/usr.sbin/dtrace/tests/common/probes/Makefile Fri Nov 24 19:57:13 2017 (r326181) @@ -35,5 +35,4 @@ CFILES= \ tst.probestar.c \ - .include "../../dtrace.test.mk" Modified: head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile Fri Nov 24 19:38:59 2017 (r326180) +++ head/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile Fri Nov 24 19:57:13 2017 (r326181) @@ -70,7 +70,6 @@ ${PACKAGE}FILES= \ TESTEXES= \ tst.NoSpecBuffer.exe \ - CFILES= \ Modified: head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile Fri Nov 24 19:38:59 2017 (r326180) +++ head/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile Fri Nov 24 19:57:13 2017 (r326181) @@ -40,4 +40,6 @@ CFILES= \ WITH_CTF=YES +CFLAGS.tst.chasestrings.exe+= -m32 + .include "../../dtrace.test.mk" Modified: head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Fri Nov 24 19:38:59 2017 (r326180) +++ head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Fri Nov 24 19:57:13 2017 (r326181) @@ -53,6 +53,8 @@ TEST_METADATA.t_dtrace_contrib+= required_memory=\"4g\ uctf) special=" WITH_CTF=YES + +CFLAGS.tst.chasestrings.exe+= -m32 " ;; esac
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711241957.vAOJvDfO088977>