/coreclr

Scripts: move intermediate file into intermediate dir #5981

Merged
merged 1 commit into from Jun 28, 2016
+11 −5

Reviewers

No reviews

Assignees

No one assigned

Labels

cla-already-signed

Projects

None yet

Milestone

No milestone

3 participants

@myungjoo @janvorli @dnfclas
@myungjoo
Contributor
myungjoo commented Jun 24, 2016

The intermediate file, cmake.definitions, is moved into
the intermediate directory: bin/obj/OS.Arch.Conf/

Fixes #5976

Signed-off-by: MyungJoo Ham [email protected]
@myungjoo
Contributor
myungjoo commented Jun 24, 2016

@dotnet-bot Test Ubuntu x64 Checked Build and Test Please
@myungjoo myungjoo changed the title from Scripts: move intermediate file into intermediate dir to [WIP] Scripts: move intermediate file into intermediate dir Jun 24, 2016
@myungjoo
Contributor
myungjoo commented Jun 24, 2016 • edited

looks like there is some path error (Windows vs Unix) in the script. Do not merge this version.

Now, it works in Windows as well as Linux.
@myungjoo myungjoo changed the title from [WIP] Scripts: move intermediate file into intermediate dir to Scripts: move intermediate file into intermediate dir Jun 24, 2016
@myungjoo
Contributor
myungjoo commented Jun 27, 2016

@dotnet-bot Test Ubuntu x64 Checked Build and Test Please
@myungjoo
Contributor
myungjoo commented Jun 27, 2016

@dotnet-bot Test Ubuntu x64 Checked Build and Test Please
@myungjoo myungjoo referenced this pull request Jun 27, 2016
Merged

Scripts: verify compiler definitions of native and managed #4675

@janvorli janvorli and 1 other commented on an outdated diff Jun 27, 2016
View full outdated diff
definitionsconsistencycheck.cmake
@@ -1,11 +1,11 @@
get_directory_property( DirDefs COMPILE_DEFINITIONS )
# Reset the definition file
-file(WRITE cmake.definitions "")
+file(WRITE $ENV{__IntermediatesDir}/cmake.definitions "")
@janvorli
janvorli Jun 27, 2016 Member

Could you please use ${CMAKE_CURRENT_BINARY_DIR} instead of the $ENV{__IntermediatesDir}? I would prefer to not to use env variables in the cmake scripts to communicate information between the build.sh and cmake scripts.
I know we have it at two or three other places, but I'd like to eventually fix it there as well.

@myungjoo
myungjoo Jun 28, 2016 Contributor

Alright. And for the problem of Windows build you've mentioned with #4675, would it be ok to make the script ignore file-not-found and smoothly move on afterwards?
@myungjoo myungjoo Move intermediate file into intermediate dir 
The intermediate file, cmake.definitions, is moved into
the intermediate directory: bin/obj/OS.Arch.Conf/

The script won't emit error for not having the cmake
results because some systems (Windows) do not use Cmake
and users might use "skipnative".

Fixes #5976

Signed-off-by: MyungJoo Ham <[email protected]>

All checks have passed

10 successful checks
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
Linux ARM Emulator Cross Release Build — Build finished.
Details
OSX x64 Checked Build and Test — Build finished.
Details
Ubuntu x64 Checked Build and Test — Build finished.
Details
Windows_NT x64 Debug Build and Test — 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
94cf281
@myungjoo
Contributor
myungjoo commented Jun 28, 2016

The recent modification includes:

  • Removal of ENV in cmake script.
  • Do not emit error code even if cmake was not used. (windows build or skipnative build)
@myungjoo
Contributor
myungjoo commented Jun 28, 2016 • edited

I think this code has nothing to do with:

MESSAGE:
BEGIN EXECUTION /mnt/j/workspace/dotnet_coreclr/master/checked_ubuntu_tst_prtest/bin/tests/Windows_NT.x64.Checked/Tests/coreoverlay/corerun test21.exe Unhandled Exception: Cannot print exception string because Exception.ToString() failed. ./test21.sh: line 117: 4460 Aborted (core dumped) $_DebuggerFullPath "$CORE_ROOT/corerun" test21.exe $CLRTestExecutionArguments Expected: 100 Actual: 134 END EXECUTION - FAILED
+++++++++++++++++++
STACK TRACE:
@myungjoo
Contributor
myungjoo commented Jun 28, 2016

@dotnet-bot Test Ubuntu x64 Checked Build and Test Please
@janvorli
Member
janvorli commented Jun 28, 2016

LGTM, thanks!
@janvorli janvorli merged commit 5acbced into dotnet:master Jun 28, 2016
10 checks passed

10 checks passed

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
Linux ARM Emulator Cross Release Build Build finished.
Details
OSX x64 Checked Build and Test Build finished.
Details
Ubuntu x64 Checked Build and Test Build finished.
Details
Windows_NT x64 Debug Build and Test 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment