/coreclr

Remove the dependency of using config.json in cwd #7330

Merged
merged 1 commit into from Sep 23, 2016

Reviewers

@weshaggard weshaggard

@dagood dagood

@RussKeldorph RussKeldorph

Assignees

No one assigned

Labels

cla-already-signed

Projects

None yet

Milestone

No milestone

6 participants

@jashook @RussKeldorph @weshaggard @dagood @dnfclas @jkotas
@jashook
Contributor
jashook commented Sep 23, 2016

Currently the config.json file is looked for in the current working
directory. This change forces run.exe to use the relative path of
the file relative to the build script.
@jashook jashook Remove the dependency of using config.json in cwd 
Currently the config.json file is looked for in the current working
directory. This change forces run.exe to use the relative path of
the file relative to the build script.

Some checks were not successful

1 failing and 11 successful checks
Linux ARM Emulator Cross Release Build — Build finished.
Details
CentOS7.1 x64 Debug Build and Test — Build finished.
Details
FreeBSD x64 Checked Build — Build finished.
Details
Linux ARM Emulator Cross Debug Build — Build finished.
Details
OSX x64 Checked Build and Test — Build finished.
Details
Ubuntu x64 Checked Build and Test — Build finished.
Details
Ubuntu x64 Formatting — Build finished.
Details
Windows_NT x64 Debug Build and Test — Build finished.
Details
Windows_NT x64 Formatting — Build finished.
Details
Windows_NT x64 Release Priority 1 Build and Test — Build finished.
Details
Windows_NT x86 legacy_backend Checked Build and Test — Build finished.
Details
Windows_NT x86 ryujit Checked Build and Test — Build finished.
Details
b5cbab3
@jashook
Contributor
jashook commented Sep 23, 2016

@maririos @dagood ptal.
/cc @dotnet/jit-contrib
@RussKeldorph
Member
RussKeldorph commented Sep 23, 2016

LGTM, FWIW
@dagood
dagood approved these changes Sep 23, 2016 View changes
run.cmd
@@ -30,10 +30,10 @@ if NOT [%ERRORLEVEL%]==[0] (
set _toolRuntime=%~dp0Tools
set _dotnet=%_toolRuntime%\dotnetcli\dotnet.exe
-echo Running: %_dotnet% %_toolRuntime%\run.exe %*
-call %_dotnet% %_toolRuntime%\run.exe %*
+echo Running: %_dotnet% %_toolRuntime%\run.exe %~dp0config.json %*
@dagood
dagood Sep 23, 2016 Member

We should port this back to buildtools, good spot to put the same path in the echo.

@jkotas jkotas merged commit 5e78b50 into dotnet:master Sep 23, 2016
11 of 12 checks passed

11 of 12 checks passed

Linux ARM Emulator Cross Release Build Build finished.
Details
CentOS7.1 x64 Debug Build and Test Build finished.
Details
FreeBSD x64 Checked Build Build finished.
Details
Linux ARM Emulator Cross Debug Build Build finished.
Details
OSX x64 Checked Build and Test Build finished.
Details
Ubuntu x64 Checked Build and Test Build finished.
Details
Ubuntu x64 Formatting Build finished.
Details
Windows_NT x64 Debug Build and Test Build finished.
Details
Windows_NT x64 Formatting Build finished.
Details
Windows_NT x64 Release Priority 1 Build and Test Build finished.
Details
Windows_NT x86 legacy_backend Checked Build and Test Build finished.
Details
Windows_NT x86 ryujit Checked Build and Test Build finished.
Details
@kvochko kvochko added a commit to kvochko/coreclr that referenced this pull request Sep 28, 2016
@jashook @kvochko jashook + kvochko Remove the dependency of using config.json in cwd (#7330) 
Currently the config.json file is looked for in the current working
directory. This change forces run.exe to use the relative path of
the file relative to the build script.
 a73308b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment