diff options
| author | Mathew Robinson <chasinglogic@gmail.com> | 2020-01-06 15:47:18 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-02-13 15:21:41 +0000 |
| commit | 12b63497b80c46f31cb1ece3a23887e50a129504 (patch) | |
| tree | 449a7f9bea146eadeceb6a00c2a39eda27577fa1 /src/third_party | |
| parent | f31bc89f66632b2d521be2d076dc23f94ff663eb (diff) | |
| download | mongo-12b63497b80c46f31cb1ece3a23887e50a129504.tar.gz | |
SERVER-45301 Not all expected aliases are present in the ninja generator output
Diffstat (limited to 'src/third_party')
| -rw-r--r-- | src/third_party/IntelRDFPMathLib20U1/SConscript | 25 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/SConscript | 2 |
2 files changed, 14 insertions, 13 deletions
diff --git a/src/third_party/IntelRDFPMathLib20U1/SConscript b/src/third_party/IntelRDFPMathLib20U1/SConscript index e5ba80446d6..58e1b7ba653 100644 --- a/src/third_party/IntelRDFPMathLib20U1/SConscript +++ b/src/third_party/IntelRDFPMathLib20U1/SConscript @@ -406,6 +406,17 @@ readtest_wrapper = env.Substfile( SUBST_DICT=readtest_dict, ) env.Depends(readtest_wrapper, readtest_input) +if get_option("install-mode") == "hygienic": + readtest_wrapper_install = env.AutoInstall( + target="$PREFIX_BINDIR", + source=readtest_wrapper, + AIB_ROLE="runtime", + AIB_COMPONENT="intel-test", + AIB_COMPONENTS_EXTRA=[ + "unittests", + "tests", + ], + ) if env.TargetOSIs('windows'): readtest_wrapper_bat = env.Substfile( @@ -426,23 +437,13 @@ if env.TargetOSIs('windows'): "tests", ], ) - env.RegisterUnitTest(readtest_wrapper_bat_install[0]) + env.RegisterTest("$UNITTEST_LIST", readtest_wrapper_bat_install[0]) else: env.RegisterUnitTest(readtest_wrapper_bat[0]) else: if get_option("install-mode") == "hygienic": - readtest_wrapper_install = env.AutoInstall( - target="$PREFIX_BINDIR", - source=readtest_wrapper, - AIB_ROLE="runtime", - AIB_COMPONENT="intel-test", - AIB_COMPONENTS_EXTRA=[ - "unittests", - "tests", - ], - ) - env.RegisterUnitTest(readtest_wrapper_install[0]) + env.RegisterTest("$UNITTEST_LIST", readtest_wrapper_install[0]) else: env.RegisterUnitTest(readtest_wrapper[0]) diff --git a/src/third_party/wiredtiger/SConscript b/src/third_party/wiredtiger/SConscript index 8247432fc4e..d6bd665e23e 100644 --- a/src/third_party/wiredtiger/SConscript +++ b/src/third_party/wiredtiger/SConscript @@ -228,7 +228,7 @@ wtbin = wtbinEnv.Program( # however, we must link with snappy, etc. as C++. The smart_link() function isn't used by # default on Windows, so we leave the value unchanged on other platforms. LINK="$CXX" if wtbinEnv["LINK"] == "$SMARTLINK" else wtbinEnv["LINK"], - AIB_COMPONENT="tools", + AIB_COMPONENT="dist-test", ) hygienic = get_option('install-mode') == 'hygienic' |