From 292b2e262283ae075c5d45e5246fa077ef2ecb69 Mon Sep 17 00:00:00 2001 From: Russ Keldorph Date: Thu, 2 Mar 2017 14:51:34 -0800 Subject: [PATCH] Use CoreCLROverridePath property for CoreFx tests Remove file copy hack and use the new msbuild property to allow overriding the runtime when running CoreFx tests. --- tests/scripts/run-corefx-tests.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/tests/scripts/run-corefx-tests.py b/tests/scripts/run-corefx-tests.py index 3be40ea..2340a64 100644 --- a/tests/scripts/run-corefx-tests.py +++ b/tests/scripts/run-corefx-tests.py @@ -256,23 +256,15 @@ def main(args): # Run the primary (non-test) corefx build - command = ' '.join(('build.cmd' if Is_windows else './build.sh', config_args)) + command = ' '.join(('build.cmd' if Is_windows else './build.sh', + config_args, + '-- /p:CoreCLROverridePath=%s' % core_root)) + log(command) returncode = 0 if testing else os.system(command) if returncode != 0: sys.exit(returncode) - # Copy the coreclr runtime we wish to run tests against. This is the recommended - # hack until a full-stack test solution is ready. This assumes there is a single - # directory under /bin/runtime into which we copy coreclr binaries. We - # assume the appropriate coreclr has already been built. - - fx_runtime_dir = os.path.join(fx_root, 'bin', 'runtime') - overlay_dest = os.path.join(fx_runtime_dir, os.listdir(fx_runtime_dir)[0]) - log('[overlay] %s -> %s' % (core_root, overlay_dest)) - if not testing: - distutils.dir_util.copy_tree(core_root, overlay_dest) - # Build the build-tests command line. if Is_windows: -- 2.7.4