@@ -9,6 +9,7 @@ var path = require('path')
99var script = path . join ( __dirname , 'fixtures' , 'script.js' )
1010var spawn = require ( 'child_process' ) . spawn
1111var strictlib = libs . strict
12+ var uid = require ( 'uid-safe' ) . sync
1213
1314describe ( 'depd(namespace)' , function ( ) {
1415 it ( 'creates deprecated function' , function ( ) {
@@ -718,7 +719,7 @@ describe('process.env.TRACE_DEPRECATION', function () {
718719
719720describe ( 'node script.js' , function ( ) {
720721 it ( 'should display deprecation message' , function ( done ) {
721- captureChildStderr ( [ script ] , function ( err , stderr ) {
722+ captureChildStderr ( script , [ ] , function ( err , stderr ) {
722723 if ( err ) return done ( err )
723724 var filename = path . relative ( process . cwd ( ) , script )
724725 assert . strictEqual ( stderr , '__timestamp__ my-cool-module deprecated oldfunction at ' + filename + ':7:10\n' )
@@ -736,7 +737,7 @@ describe('node script.js', function () {
736737
737738 describe ( 'node --no-deprecation script.js' , function ( ) {
738739 it ( 'should suppress deprecation message' , function ( done ) {
739- captureChildStderr ( [ '--no-deprecation' , script ] , function ( err , stderr ) {
740+ captureChildStderr ( script , [ '--no-deprecation' ] , function ( err , stderr ) {
740741 if ( err ) return done ( err )
741742 assert . strictEqual ( stderr , '' )
742743 done ( )
@@ -746,7 +747,7 @@ describe('node script.js', function () {
746747
747748 describe ( 'node --trace-deprecation script.js' , function ( ) {
748749 it ( 'should suppress deprecation message' , function ( done ) {
749- captureChildStderr ( [ '--trace-deprecation' , script ] , function ( err , stderr ) {
750+ captureChildStderr ( script , [ '--trace-deprecation' ] , function ( err , stderr ) {
750751 if ( err ) return done ( err )
751752 assert . ok ( stderr . indexOf ( '__timestamp__ my-cool-module deprecated oldfunction\n at run (' + script + ':7:10)\n at' ) === 0 )
752753 done ( )
@@ -755,10 +756,16 @@ describe('node script.js', function () {
755756 } )
756757} ( ) )
757758
758- function captureChildStderr ( args , callback ) {
759+ function captureChildStderr ( script , opts , callback ) {
759760 var chunks = [ ]
760761 var env = { PATH : process . env . PATH }
761762 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+
762769 var proc = spawn ( exec , args , {
763770 env : env
764771 } )
0 commit comments