Commit 47fa765
tools: optimize wildcard execution in tools/test.py
Previously for each matching test, it would execute multiple
`node -p` commands to decide the configurations of the executable.
That means if there are 100 tests matched, it will run the Node.js
executable 4*100 times to retrieve the same configurations repeatedly.
This changes the loop order so that it only execute these commands
once and reuse the results for all matching tests.
PR-URL: #60266
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>1 parent df8396a commit 47fa765
1 file changed
Lines changed: 22 additions & 21 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1712,27 +1712,28 @@ def Main(): | |||
| 1712 | 1712 | all_unused = [ ] | |
| 1713 | 1713 | unclassified_tests = [ ] | |
| 1714 | 1714 | globally_unused_rules = None | |
| 1715 | - for path in paths: | ||
| 1716 | - for arch in options.arch: | ||
| 1717 | - for mode in options.mode: | ||
| 1718 | - vm = context.GetVm(arch, mode) | ||
| 1719 | - if not exists(vm): | ||
| 1720 | - print("Can't find shell executable: '%s'" % vm) | ||
| 1721 | - continue | ||
| 1722 | - archEngineContext = Execute([vm, "-p", "process.arch"], context) | ||
| 1723 | - vmArch = archEngineContext.stdout.rstrip() | ||
| 1724 | - if archEngineContext.exit_code != 0 or vmArch == "undefined": | ||
| 1725 | - print("Can't determine the arch of: '%s'" % vm) | ||
| 1726 | - print(archEngineContext.stderr.rstrip()) | ||
| 1727 | - continue | ||
| 1728 | - env = { | ||
| 1729 | - 'mode': mode, | ||
| 1730 | - 'system': utils.GuessOS(), | ||
| 1731 | - 'arch': vmArch, | ||
| 1732 | - 'type': get_env_type(vm, options.type, context), | ||
| 1733 | - 'asan': get_asan_state(vm, context), | ||
| 1734 | - 'pointer_compression': get_pointer_compression_state(vm, context), | ||
| 1735 | - } | ||
| 1715 | + | ||
| 1716 | + for arch in options.arch: | ||
| 1717 | + for mode in options.mode: | ||
| 1718 | + vm = context.GetVm(arch, mode) | ||
| 1719 | + if not exists(vm): | ||
| 1720 | + print("Can't find shell executable: '%s'" % vm) | ||
| 1721 | + continue | ||
| 1722 | + archEngineContext = Execute([vm, "-p", "process.arch"], context) | ||
| 1723 | + vmArch = archEngineContext.stdout.rstrip() | ||
| 1724 | + if archEngineContext.exit_code != 0 or vmArch == "undefined": | ||
| 1725 | + print("Can't determine the arch of: '%s'" % vm) | ||
| 1726 | + print(archEngineContext.stderr.rstrip()) | ||
| 1727 | + continue | ||
| 1728 | + env = { | ||
| 1729 | + 'mode': mode, | ||
| 1730 | + 'system': utils.GuessOS(), | ||
| 1731 | + 'arch': vmArch, | ||
| 1732 | + 'type': get_env_type(vm, options.type, context), | ||
| 1733 | + 'asan': get_asan_state(vm, context), | ||
| 1734 | + 'pointer_compression': get_pointer_compression_state(vm, context), | ||
| 1735 | + } | ||
| 1736 | + for path in paths: | ||
| 1736 | 1737 | test_list = root.ListTests([], path, context, arch, mode) | |
| 1737 | 1738 | unclassified_tests += test_list | |
| 1738 | 1739 | cases, unused_rules = config.ClassifyTests(test_list, env) | |
0 commit comments