diff options
| author | pfg <pfg@FreeBSD.org> | 2013-07-28 01:02:17 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2013-07-28 01:02:17 +0000 |
| commit | 03e98d6f134feab2031878eb43dc371db8602c2c (patch) | |
| tree | 47da3cce38e166ccb0fc29bf9113d2d313e96a03 /cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d | |
| parent | 46097436dce0630481061f04e049041976f3e295 (diff) | |
| download | FreeBSD-src-03e98d6f134feab2031878eb43dc371db8602c2c.zip FreeBSD-src-03e98d6f134feab2031878eb43dc371db8602c2c.tar.gz | |
DTrace: re-apply r249426 now that the underlying issues have been solved.
Merge change from illumos:
3519 DTrace fails to resolve const types from fbt
3520 dtrace internal error -- token type 316 is not a valid D
compilation token
3521 clean up dtrace unit tests
Illumos Revision: e98f46c
Reference:
https://www.illumos.org/issues/3519
https://www.illumos.org/issues/3520
https://www.illumos.org/issues/3521
Tested by: Fabian Keil
Obtained from: Illumos
MFC after: 1 month
Diffstat (limited to 'cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d index 392c18a..0f23737 100644 --- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d +++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d @@ -24,7 +24,9 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 2012 by Delphix. All rights reserved. + */ #pragma D option quiet @@ -36,3 +38,8 @@ BEGIN printf("%s\n", strjoin("", "")); exit(0); } + +BEGIN +{ + exit(1); +} |
