Skip to content

Commit 7fc7cd7

Browse files
danbevdanbev
committed
build: add node_lib_target_name to cctest deps
Currently the cctest target depend on the node_core_target_name target. But it is the node_lib_target_name target that compiles the sources now which means that if a source file in src is updated the cctest executable will not be re-linked against it, but will remain unchanged. The code will still be compiled, just not linked which means that if you are debugging you'll not see the changes and also a warning will be displayed about this issue. This commit changes the cctest target to depend on node_lib_target_name. PR-URL: nodejs#18576 Reviewed-By: Matheus Marchini <matheus@sthima.com> Reviewed-By: Yihong Wang <yh.wang@ibm.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
1 parent aec66c6 commit 7fc7cd7

2 files changed

Lines changed: 3 additions & 155 deletions

File tree

‎node.gyp‎

Lines changed: 3 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@
906906
'type': 'executable',
907907

908908
'dependencies': [
909-
'<(node_core_target_name)',
909+
'<(node_lib_target_name)',
910910
'rename_node_bin_win',
911911
'deps/gtest/gtest.gyp:gtest',
912912
'node_js2c#host',
@@ -915,39 +915,6 @@
915915
'node_dtrace_provider',
916916
],
917917

918-
'variables': {
919-
'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src',
920-
'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/gen',
921-
'OBJ_TRACING_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src/tracing',
922-
'OBJ_SUFFIX': 'o',
923-
'OBJ_SEPARATOR': '/',
924-
'conditions': [
925-
['OS=="win"', {
926-
'OBJ_SUFFIX': 'obj',
927-
}],
928-
['GENERATOR=="ninja"', {
929-
'OBJ_PATH': '<(OBJ_DIR)/src',
930-
'OBJ_GEN_PATH': '<(OBJ_DIR)/gen',
931-
'OBJ_TRACING_PATH': '<(OBJ_DIR)/src/tracing',
932-
'OBJ_SEPARATOR': '/<(node_lib_target_name).',
933-
}, {
934-
'conditions': [
935-
['OS=="win"', {
936-
'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)',
937-
'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)',
938-
'OBJ_TRACING_PATH': '<(OBJ_DIR)/<(node_lib_target_name)',
939-
}],
940-
['OS=="aix"', {
941-
'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src',
942-
'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/gen',
943-
'OBJ_TRACING_PATH':
944-
'<(OBJ_DIR)/<(node_lib_target_name)/src/tracing',
945-
}],
946-
]}
947-
]
948-
],
949-
},
950-
951918
'includes': [
952919
'node.gypi'
953920
],
@@ -964,7 +931,6 @@
964931
'defines': [ 'NODE_WANT_INTERNALS=1' ],
965932

966933
'sources': [
967-
'test/cctest/node_module_reg.cc',
968934
'test/cctest/node_test_fixture.cc',
969935
'test/cctest/test_aliased_buffer.cc',
970936
'test/cctest/test_base64.cc',
@@ -973,118 +939,30 @@
973939
'test/cctest/test_url.cc'
974940
],
975941

976-
'libraries': [
977-
'<(OBJ_PATH)<(OBJ_SEPARATOR)async_wrap.<(OBJ_SUFFIX)',
978-
'<(OBJ_PATH)<(OBJ_SEPARATOR)env.<(OBJ_SUFFIX)',
979-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node.<(OBJ_SUFFIX)',
980-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_buffer.<(OBJ_SUFFIX)',
981-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_debug_options.<(OBJ_SUFFIX)',
982-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_i18n.<(OBJ_SUFFIX)',
983-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_perf.<(OBJ_SUFFIX)',
984-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_platform.<(OBJ_SUFFIX)',
985-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_url.<(OBJ_SUFFIX)',
986-
'<(OBJ_PATH)<(OBJ_SEPARATOR)util.<(OBJ_SUFFIX)',
987-
'<(OBJ_PATH)<(OBJ_SEPARATOR)string_bytes.<(OBJ_SUFFIX)',
988-
'<(OBJ_PATH)<(OBJ_SEPARATOR)string_search.<(OBJ_SUFFIX)',
989-
'<(OBJ_PATH)<(OBJ_SEPARATOR)stream_base.<(OBJ_SUFFIX)',
990-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_constants.<(OBJ_SUFFIX)',
991-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)agent.<(OBJ_SUFFIX)',
992-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_buffer.<(OBJ_SUFFIX)',
993-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_writer.<(OBJ_SUFFIX)',
994-
'<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)trace_event.<(OBJ_SUFFIX)',
995-
'<(OBJ_GEN_PATH)<(OBJ_SEPARATOR)node_javascript.<(OBJ_SUFFIX)',
996-
],
997-
998942
'conditions': [
999943
[ 'node_use_openssl=="true"', {
1000-
'conditions': [
1001-
['node_target_type!="static_library"', {
1002-
'libraries': [
1003-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto.<(OBJ_SUFFIX)',
1004-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_bio.<(OBJ_SUFFIX)',
1005-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_clienthello.<(OBJ_SUFFIX)',
1006-
'<(OBJ_PATH)<(OBJ_SEPARATOR)tls_wrap.<(OBJ_SUFFIX)',
1007-
],
1008-
}],
1009-
],
1010944
'defines': [
1011945
'HAVE_OPENSSL=1',
1012946
],
1013947
}],
1014948
[ 'node_use_perfctr=="true"', {
1015949
'defines': [ 'HAVE_PERFCTR=1' ],
1016-
'libraries': [
1017-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_counters.<(OBJ_SUFFIX)',
1018-
'<(OBJ_PATH)<(OBJ_SEPARATOR)'
1019-
'node_win32_perfctr_provider.<(OBJ_SUFFIX)',
1020-
],
1021950
}],
1022951
['v8_enable_inspector==1', {
1023952
'sources': [
1024953
'test/cctest/test_inspector_socket.cc',
1025954
'test/cctest/test_inspector_socket_server.cc'
1026955
],
1027-
'conditions': [
1028-
['node_target_type!="static_library"', {
1029-
'libraries': [
1030-
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_agent.<(OBJ_SUFFIX)',
1031-
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_io.<(OBJ_SUFFIX)',
1032-
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_js_api.<(OBJ_SUFFIX)',
1033-
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_socket.<(OBJ_SUFFIX)',
1034-
'<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_socket_server.<(OBJ_SUFFIX)',
1035-
],
1036-
}],
1037-
],
1038956
'defines': [
1039957
'HAVE_INSPECTOR=1',
1040958
],
1041-
}],
1042-
[ 'node_use_dtrace=="true" and node_target_type!="static_library"', {
1043-
'libraries': [
1044-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)',
1045-
],
1046-
'conditions': [
1047-
['OS!="mac" and OS!="linux"', {
1048-
'libraries': [
1049-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_provider.<(OBJ_SUFFIX)',
1050-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_ustack.<(OBJ_SUFFIX)',
1051-
]
1052-
}],
1053-
['OS=="linux"', {
1054-
'libraries': [
1055-
'<(SHARED_INTERMEDIATE_DIR)<(OBJ_SEPARATOR)'
1056-
'node_dtrace_provider.<(OBJ_SUFFIX)',
1057-
]
1058-
}],
1059-
],
1060-
}, {
1061-
'conditions': [
1062-
[ 'node_use_etw=="true" and OS=="win"', {
1063-
'libraries': [
1064-
'<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)',
1065-
'<(OBJ_PATH)<(OBJ_SEPARATOR)'
1066-
'node_win32_etw_provider.<(OBJ_SUFFIX)',
1067-
],
1068-
}]
1069-
]
1070-
}],
1071-
[ 'OS=="win" and node_target_type!="static_library"', {
1072-
'libraries': [
1073-
'<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_win32.<(OBJ_SUFFIX)',
1074-
],
1075959
}, {
1076-
'conditions': [
1077-
['node_target_type!="static_library"', {
1078-
'libraries': [
1079-
'<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_posix.<(OBJ_SUFFIX)',
1080-
],
1081-
}],
1082-
],
960+
'defines': [ 'HAVE_INSPECTOR=0' ]
1083961
}],
1084962
['OS=="solaris"', {
1085963
'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ]
1086964
}],
1087-
]
965+
],
1088966
}
1089967
], # end targets
1090968

‎test/cctest/node_module_reg.cc‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)