File tree Expand file tree Collapse file tree 3 files changed +21
-8
lines changed Expand file tree Collapse file tree 3 files changed +21
-8
lines changed Original file line number Diff line number Diff line change @@ -1394,6 +1394,11 @@ def gcc_version_ge(version_checked):
13941394def configure_node_lib_files (o ):
13951395 o ['variables' ]['node_library_files' ] = SearchFiles ('lib' , 'js' )
13961396
1397+ def configure_node_cctest_sources (o ):
1398+ o ['variables' ]['node_cctest_sources' ] = [ 'src/node_snapshot_stub.cc' ] + \
1399+ SearchFiles ('test/cctest' , 'cc' ) + \
1400+ SearchFiles ('test/cctest' , 'h' )
1401+
13971402def configure_node (o ):
13981403 if options .dest_os == 'android' :
13991404 o ['variables' ]['OS' ] = 'android'
@@ -2207,6 +2212,7 @@ def make_bin_override():
22072212
22082213configure_node (output )
22092214configure_node_lib_files (output )
2215+ configure_node_cctest_sources (output )
22102216configure_napi (output )
22112217configure_library ('zlib' , output )
22122218configure_library ('http_parser' , output )
Original file line number Diff line number Diff line change 402402 'src/quic/transportparams.h' ,
403403 'src/quic/quic.cc' ,
404404 ],
405- 'node_cctest_sources' : [
406- 'src/node_snapshot_stub.cc' ,
407- '<!@("<(python)" tools/search_files.py . test/cctest cc)' ,
408- '<!@("<(python)" tools/search_files.py . test/cctest h)' ,
409- ],
410405 'node_cctest_openssl_sources' : [
411406 'test/cctest/test_crypto_clienthello.cc' ,
412407 'test/cctest/test_node_crypto.cc' ,
Original file line number Diff line number Diff line change @@ -362,13 +362,25 @@ template("node_gn_build") {
362362 " $node_simdutf_path " ,
363363 ]
364364
365- sources = gypi_values .node_cctest_sources
365+ sources = exec_script (" ./tools/search_files.py" ,
366+ [ rebase_path (" ." , root_build_dir ),
367+ rebase_path (" test/cctest" , root_build_dir ),
368+ " cc" ],
369+ " list lines" )
370+
366371 if (node_use_openssl ) {
367372 deps += [ " deps/ncrypto" ]
368- sources += gypi_values .node_cctest_openssl_sources
373+ } else {
374+ sources -= gypi_values .node_cctest_openssl_sources
369375 }
370376 if (node_enable_inspector ) {
371- sources += gypi_values .node_cctest_inspector_sources
377+ deps += [ " src/inspector:crdtp" ]
378+ include_dirs = [
379+ " $target_gen_dir /src" ,
380+ " $target_gen_dir /src/inspector" ,
381+ ]
382+ } else {
383+ sources -= gypi_values .node_cctest_inspector_sources
372384 }
373385 }
374386
You can’t perform that action at this time.
0 commit comments