Commit 1146f48
test: search cctest files
To prevent a new cctest missing from the `node.gyp`, search cctest
files with tool `search_files.py` at configure time.
PR-URL: #56791
Refs: #55275
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Daniel Lemire <daniel@lemire.me>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>1 parent 86c199b commit 1146f48
2 files changed
Lines changed: 9 additions & 23 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -402,26 +402,8 @@ | |||
| 402 | 402 | ], | |
| 403 | 403 | 'node_cctest_sources': [ | |
| 404 | 404 | 'src/node_snapshot_stub.cc', | |
| 405 | - 'test/cctest/node_test_fixture.cc', | ||
| 406 | - 'test/cctest/node_test_fixture.h', | ||
| 407 | - 'test/cctest/test_aliased_buffer.cc', | ||
| 408 | - 'test/cctest/test_base64.cc', | ||
| 409 | - 'test/cctest/test_base_object_ptr.cc', | ||
| 410 | - 'test/cctest/test_cppgc.cc', | ||
| 411 | - 'test/cctest/test_node_postmortem_metadata.cc', | ||
| 412 | - 'test/cctest/test_node_task_runner.cc', | ||
| 413 | - 'test/cctest/test_environment.cc', | ||
| 414 | - 'test/cctest/test_linked_binding.cc', | ||
| 415 | - 'test/cctest/test_node_api.cc', | ||
| 416 | - 'test/cctest/test_path.cc', | ||
| 417 | - 'test/cctest/test_per_process.cc', | ||
| 418 | - 'test/cctest/test_platform.cc', | ||
| 419 | - 'test/cctest/test_report.cc', | ||
| 420 | - 'test/cctest/test_json_utils.cc', | ||
| 421 | - 'test/cctest/test_sockaddr.cc', | ||
| 422 | - 'test/cctest/test_traced_value.cc', | ||
| 423 | - 'test/cctest/test_util.cc', | ||
| 424 | - 'test/cctest/test_dataqueue.cc', | ||
| 405 | + '<!@(<(python) tools/search_files.py . test/cctest cc)', | ||
| 406 | + '<!@(<(python) tools/search_files.py . test/cctest h)', | ||
| 425 | 407 | ], | |
| 426 | 408 | 'node_cctest_openssl_sources': [ | |
| 427 | 409 | 'test/cctest/test_crypto_clienthello.cc', | |
@@ -1204,13 +1186,13 @@ | |||
| 1204 | 1186 | 'dependencies': [ | |
| 1205 | 1187 | 'deps/ncrypto/ncrypto.gyp:ncrypto', | |
| 1206 | 1188 | ], | |
| 1207 | - 'sources': [ '<@(node_cctest_openssl_sources)' ], | ||
| 1189 | + }, { | ||
| 1190 | + 'sources!': [ '<@(node_cctest_openssl_sources)' ], | ||
| 1208 | 1191 | }], | |
| 1209 | 1192 | ['v8_enable_inspector==1', { | |
| 1210 | 1193 | 'defines': [ | |
| 1211 | 1194 | 'HAVE_INSPECTOR=1', | |
| 1212 | 1195 | ], | |
| 1213 | - 'sources': [ '<@(node_cctest_inspector_sources)' ], | ||
| 1214 | 1196 | 'include_dirs': [ | |
| 1215 | 1197 | # TODO(legendecas): make node_inspector.gypi a dependable target. | |
| 1216 | 1198 | '<(SHARED_INTERMEDIATE_DIR)', # for inspector | |
@@ -1222,7 +1204,8 @@ | |||
| 1222 | 1204 | }, { | |
| 1223 | 1205 | 'defines': [ | |
| 1224 | 1206 | 'HAVE_INSPECTOR=0', | |
| 1225 | - ] | ||
| 1207 | + ], | ||
| 1208 | + 'sources!': [ '<@(node_cctest_inspector_sources)' ], | ||
| 1226 | 1209 | }], | |
| 1227 | 1210 | ['OS=="solaris"', { | |
| 1228 | 1211 | 'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ] | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -14,6 +14,9 @@ | |||
| 14 | 14 | try: | |
| 15 | 15 | files = SearchFiles(*sys.argv[2:]) | |
| 16 | 16 | files = [ os.path.relpath(x, sys.argv[1]) for x in files ] | |
| 17 | + # Apply the same transform in SearchFiles after relpath | ||
| 18 | + if sys.platform == 'win32': | ||
| 19 | + files = [ x.replace('\\', '/') for x in files ] | ||
| 17 | 20 | print('\n'.join(files)) | |
| 18 | 21 | except Exception as e: | |
| 19 | 22 | print(str(e)) | |
0 commit comments