@@ -9,6 +9,7 @@ var path = require('path')
9
9
var script = path . join ( __dirname , 'fixtures' , 'script.js' )
10
10
var spawn = require ( 'child_process' ) . spawn
11
11
var strictlib = libs . strict
12
+ var uid = require ( 'uid-safe' ) . sync
12
13
13
14
describe ( 'depd(namespace)' , function ( ) {
14
15
it ( 'creates deprecated function' , function ( ) {
@@ -718,7 +719,7 @@ describe('process.env.TRACE_DEPRECATION', function () {
718
719
719
720
describe ( 'node script.js' , function ( ) {
720
721
it ( 'should display deprecation message' , function ( done ) {
721
- captureChildStderr ( [ script ] , function ( err , stderr ) {
722
+ captureChildStderr ( script , [ ] , function ( err , stderr ) {
722
723
if ( err ) return done ( err )
723
724
var filename = path . relative ( process . cwd ( ) , script )
724
725
assert . strictEqual ( stderr , '__timestamp__ my-cool-module deprecated oldfunction at ' + filename + ':7:10\n' )
@@ -736,7 +737,7 @@ describe('node script.js', function () {
736
737
737
738
describe ( 'node --no-deprecation script.js' , function ( ) {
738
739
it ( 'should suppress deprecation message' , function ( done ) {
739
- captureChildStderr ( [ '--no-deprecation' , script ] , function ( err , stderr ) {
740
+ captureChildStderr ( script , [ '--no-deprecation' ] , function ( err , stderr ) {
740
741
if ( err ) return done ( err )
741
742
assert . strictEqual ( stderr , '' )
742
743
done ( )
@@ -746,7 +747,7 @@ describe('node script.js', function () {
746
747
747
748
describe ( 'node --trace-deprecation script.js' , function ( ) {
748
749
it ( 'should suppress deprecation message' , function ( done ) {
749
- captureChildStderr ( [ '--trace-deprecation' , script ] , function ( err , stderr ) {
750
+ captureChildStderr ( script , [ '--trace-deprecation' ] , function ( err , stderr ) {
750
751
if ( err ) return done ( err )
751
752
assert . ok ( stderr . indexOf ( '__timestamp__ my-cool-module deprecated oldfunction\n at run (' + script + ':7:10)\n at' ) === 0 )
752
753
done ( )
@@ -755,10 +756,16 @@ describe('node script.js', function () {
755
756
} )
756
757
} ( ) )
757
758
758
- function captureChildStderr ( args , callback ) {
759
+ function captureChildStderr ( script , opts , callback ) {
759
760
var chunks = [ ]
760
761
var env = { PATH : process . env . PATH }
761
762
var exec = process . execPath
763
+
764
+ var args = process . env . running_under_istanbul
765
+ ? opts . concat ( path . join ( __dirname , '..' , 'node_modules' , 'istanbul' , 'lib' , 'cli.js' ) ,
766
+ 'cover' , '--dir=./coverage/child-' + uid ( 8 ) , '--print=none' , script )
767
+ : opts . concat ( script )
768
+
762
769
var proc = spawn ( exec , args , {
763
770
env : env
764
771
} )
0 commit comments