Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unify corerun test runner #49529

Merged
merged 9 commits into from
Mar 17, 2021
Merged

Unify corerun test runner #49529

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
33369e8
Remove unused files.
AaronRobinsonMSFT Mar 13, 2021
d9b46c2
Rewrite corerun so that it runs on all platforms.
AaronRobinsonMSFT Mar 13, 2021
6f6a9da
Missed forward declare of overload.
AaronRobinsonMSFT Mar 14, 2021
05faa28
Dump the computed configuration for runtime if a failure to
AaronRobinsonMSFT Mar 14, 2021
cb759b2
Add debugger attach support for systems with procfs.
AaronRobinsonMSFT Mar 14, 2021
2521534
Simplfy CMake for including the coreclr/hosts project.
AaronRobinsonMSFT Mar 14, 2021
053cf2b
Revert "Simplfy CMake for including the coreclr/hosts project."
AaronRobinsonMSFT Mar 14, 2021
de2c659
Add comments to the self-testing method.
AaronRobinsonMSFT Mar 15, 2021
c73af2e
Remove the corerun option for setting System.Globalization.Invariant.
AaronRobinsonMSFT Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/coreclr/hosts/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
include_directories(inc)

if(CLR_CMAKE_HOST_WIN32)
add_subdirectory(corerun)
add_subdirectory(coreshim)
else(CLR_CMAKE_HOST_WIN32)
add_definitions(-D_FILE_OFFSET_BITS=64)
add_subdirectory(unixcorerun)
AaronRobinsonMSFT marked this conversation as resolved.
Show resolved Hide resolved
endif(CLR_CMAKE_HOST_WIN32)

add_subdirectory(corerun)
128 changes: 0 additions & 128 deletions src/coreclr/hosts/applydefines.pl
View file
Open in desktop

This file was deleted.

42 changes: 28 additions & 14 deletions src/coreclr/hosts/corerun/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,35 @@
project(CoreRun)
project(corerun)

set(CMAKE_INCLUDE_CURRENT_DIR ON)
add_definitions(-DFX_VER_INTERNALNAME_STR=CoreRun.exe)

_add_executable(CoreRun
corerun.cpp logger.cpp
if(CLR_CMAKE_HOST_WIN32)
add_definitions(-DFX_VER_INTERNALNAME_STR=corerun.exe)
else(CLR_CMAKE_HOST_WIN32)
include_directories("${CLR_SRC_NATIVE_DIR}/common")
include(configure.cmake)
endif(CLR_CMAKE_HOST_WIN32)

_add_executable(corerun
corerun.cpp
native.rc
)

target_link_libraries(CoreRun
utilcodestaticnohost
advapi32.lib
oleaut32.lib
uuid.lib
user32.lib
${STATIC_MT_CRT_LIB}
${STATIC_MT_VCRT_LIB}
)
if(CLR_CMAKE_HOST_WIN32)
target_link_libraries(corerun
advapi32.lib
oleaut32.lib
uuid.lib
user32.lib
${STATIC_MT_CRT_LIB}
${STATIC_MT_VCRT_LIB}
)
else(CLR_CMAKE_HOST_WIN32)
target_link_libraries(corerun ${CMAKE_DL_LIBS})

# Android implements pthread natively
if(NOT CLR_CMAKE_TARGET_ANDROID)
target_link_libraries(corerun pthread)
endif()
endif(CLR_CMAKE_HOST_WIN32)

install_clr(TARGETS CoreRun)
install_clr(TARGETS corerun)
0 src/coreclr/hosts/unixcorerun/config.h.in → src/coreclr/hosts/corerun/config.h.in
View file
Open in desktop
File renamed without changes.
0 ...coreclr/hosts/unixcorerun/configure.cmake → src/coreclr/hosts/corerun/configure.cmake
View file
Open in desktop
File renamed without changes.
Loading