From 47829c46f82467841b19e464d67721ccbedd554f Mon Sep 17 00:00:00 2001 From: Konstantin Baladurin Date: Fri, 4 Oct 2019 19:45:44 +0300 Subject: [PATCH] [Tizen] skip dotnet specific arguments in corerun Now we use corerun to run corefx tests instead of dotnet, because last one isn't available for Tizen/armel. So we need to skip dotnet specific arguments, we patch corerun for it because Microsoft.DotNet.RemoteExecutor tries to execute binary that it gets from /proc/self/maps, so we need a binary that will behave like dotnet. --- src/coreclr/hosts/corerun/corerun.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/coreclr/hosts/corerun/corerun.cpp b/src/coreclr/hosts/corerun/corerun.cpp index 4e506b95c97..015fb28a9e5 100644 --- a/src/coreclr/hosts/corerun/corerun.cpp +++ b/src/coreclr/hosts/corerun/corerun.cpp @@ -506,6 +506,11 @@ static bool parse_args( // First argument that is not an option is the managed assembly to execute. if (!is_option) { + if (pal::strcmp(argv[i], W("exec")) == 0) + { + continue; + } + config.entry_assembly_fullpath = pal::get_absolute_path(argv[i]); i++; // Move to next argument. @@ -595,6 +600,15 @@ static bool parse_args( display_usage(); break; } + // Now we use corerun to run corefx tests instead of dotnet, because last one isn't available for + // Tizen/armel. So we need to skip dotnet specific arguments, we patch corerun for it because + // Microsoft.DotNet.RemoteExecutor tries to execute binary that it gets from /proc/self/maps, so we + // need a binary that will behave like dotnet. + else if (pal::strcmp(option, W("runtimeconfig")) == 0 || pal::strcmp(option, W("depsfile")) == 0) + { + i++; + continue; + } else { pal::fprintf(stderr, W("Unknown option %s\n"), arg); -- 2.34.1