@@ -10,12 +10,21 @@ const getTestCases = require('./fixtures/logbypass.test');
1010const logdirBlocking = utils . createLogDir ( 'log_bypass_blocking' ) ;
1111const logdirNonBlocking = utils . createLogDir ( 'log_bypass_non_blocking' ) ;
1212
13+ // common cases
1314let cases = getTestCases ( 'performance log correctly' , logdirBlocking , logdirNonBlocking ) ;
15+
16+ // libuv cases
17+ const logdirBlockingForUv = utils . createLogDir ( 'log_bypass_blocking_uv' ) ;
18+ const logdirNonBlockingForUv = utils . createLogDir ( 'log_bypass_non_blocking_uv' ) ;
1419const casesForLibuv = getTestCases ( 'performance log correctly with XPROFILER_ENABLE_LOG_UV_HANDLES=NO' ,
15- logdirBlocking , logdirNonBlocking , { XPROFILER_ENABLE_LOG_UV_HANDLES : 'NO' } ,
20+ logdirBlockingForUv , logdirNonBlockingForUv , { XPROFILER_ENABLE_LOG_UV_HANDLES : 'NO' } ,
1621 { uv : getTestCases . getUvRules ( [ 'active_handles' ] ) } ) ;
22+
23+ // http cases
24+ const logdirBlockingForHttp = utils . createLogDir ( 'log_bypass_blocking_http' ) ;
25+ const logdirNonBlockingForHttp = utils . createLogDir ( 'log_bypass_non_blocking_http' ) ;
1726const casesForHttp = getTestCases ( 'performance log correctly XPROFILER_PATCH_HTTP=YES' ,
18- logdirBlocking , logdirNonBlocking , { XPROFILER_PATCH_HTTP : 'YES' } ,
27+ logdirBlockingForHttp , logdirNonBlockingForHttp , { XPROFILER_PATCH_HTTP : 'YES' } ,
1928 {
2029 http : {
2130 live_http_request : / ^ \d + $ / ,
@@ -24,6 +33,8 @@ const casesForHttp = getTestCases('performance log correctly XPROFILER_PATCH_HT
2433 http_rt : / ^ \d + .\d { 2 } $ /
2534 }
2635 } ) ;
36+
37+ // compose cases
2738cases = cases . concat ( casesForLibuv ) . concat ( casesForHttp ) ;
2839
2940function parseLog ( logType , content , patt , alinode ) {
@@ -76,6 +87,10 @@ for (const testCase of cases) {
7687 if ( testCase . targets . indexOf ( target ) === testCase . targets . length - 1 ) {
7788 utils . cleanDir ( logdirBlocking ) ;
7889 utils . cleanDir ( logdirNonBlocking ) ;
90+ utils . cleanDir ( logdirBlockingForUv ) ;
91+ utils . cleanDir ( logdirNonBlockingForUv ) ;
92+ utils . cleanDir ( logdirBlockingForHttp ) ;
93+ utils . cleanDir ( logdirNonBlockingForHttp ) ;
7994 }
8095 }
8196 } ) ;
0 commit comments