diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2020-11-20 13:24:19 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-11-20 20:20:40 +0000 |
| commit | 7759f590c0efcc8878294ff6048f9e5482daa843 (patch) | |
| tree | 5f01c26246d6f6bbd215dbac52f00ec38091a759 | |
| parent | dee89c5e789b1ce136284d2b131cfdd9c08377c0 (diff) | |
| download | mongo-7759f590c0efcc8878294ff6048f9e5482daa843.tar.gz | |
SERVER-52613 Support Enterprise module imports in IDL
| -rw-r--r-- | etc/evergreen.yml | 2 | ||||
| -rwxr-xr-x | site_scons/site_tools/idl_tool.py | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index d826dfd4ef8..284177dbad4 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -4200,7 +4200,7 @@ tasks: set -o verbose ${activate_virtualenv} - $python buildscripts/idl/check_versioned_api_commands_have_idl_definitions.py -v --include src --installDir dist-test/bin 1 + $python buildscripts/idl/check_versioned_api_commands_have_idl_definitions.py -v --include src --include src/mongo/db/modules/enterprise/src --installDir dist-test/bin 1 $python buildscripts/idl/checkout_idl_files_from_past_releases.py -v idls - name: burn_in_tests_gen diff --git a/site_scons/site_tools/idl_tool.py b/site_scons/site_tools/idl_tool.py index 50687a3d6ca..ba954203be6 100755 --- a/site_scons/site_tools/idl_tool.py +++ b/site_scons/site_tools/idl_tool.py @@ -69,9 +69,16 @@ def idl_scanner(node, env, path): nodes_deps_list = IDL_GLOBAL_DEPS[:] + # Compute the include paths to use based on the include flags in IDLCFLAGS + flags = env["IDLCFLAGS"] + include_paths = [] + for i in range(len(flags)): + if flags[i] == "--include": + include_paths.append(flags[i + 1]) + with open(str(node), encoding="utf-8") as file_stream: parsed_doc = idlc.parser.parse( - file_stream, str(node), idlc.CompilerImportResolver(["src"]) + file_stream, str(node), idlc.CompilerImportResolver(include_paths) ) if not parsed_doc.errors and parsed_doc.spec.imports is not None: |