From a16a8a852077b0c471cf12ef75dc5e8a41333533 Mon Sep 17 00:00:00 2001 From: Russ Keldorph Date: Mon, 22 May 2017 11:24:09 -0700 Subject: [PATCH] Revert "Fixed tests build on Linux" --- build-test.sh | 645 --------------------- build.sh | 5 +- dependencies.props | 1 - dir.props | 12 +- init-tools.sh | 3 +- src/build.proj | 1 - tests/build.proj | 3 +- tests/dir.props | 30 +- tests/helixperftasks.targets | 1 - tests/helixprep.proj | 1 - tests/helixpublish.proj | 1 - tests/override.targets | 1 - tests/runtest.proj | 29 +- tests/src/CLRTest.Execute.Bash.targets | 9 +- tests/src/CLRTest.Execute.targets | 3 +- tests/src/CLRTest.Jit.targets | 17 +- tests/src/GC/LargeMemory/API/gc/memcheck.csproj | 2 +- .../src/GC/LargeMemory/Allocation/memcheck.csproj | 2 +- tests/src/IL.targets | 10 +- .../Directed/FaultHandlers/Simple/Simple.ilproj | 2 +- .../JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj | 2 +- .../JIT/Directed/IL/Tailcall/JitTailcall2.ilproj | 2 +- .../localloc/zeroinit/zeroInit01_large.ilproj | 2 +- .../CLR-x86-JIT/V1-M10/b04345/B04345.ilproj | 2 +- .../localloc/zeroinit/zeroInit01_small.ilproj | 2 +- .../JIT/opt/Devirtualization/GitHub_9945.csproj | 1 - .../src/JIT/opt/Devirtualization/comparable.csproj | 2 +- tests/src/NuGet.Config | 1 - tests/src/dir.common.props | 5 +- tests/src/dir.props | 11 +- tests/src/dir.targets | 8 +- tests/src/dirs.proj | 112 +--- tests/testsFailingOutsideWindows.txt | 1 - 33 files changed, 67 insertions(+), 862 deletions(-) delete mode 100755 build-test.sh diff --git a/build-test.sh b/build-test.sh deleted file mode 100755 index 058b9c1..0000000 --- a/build-test.sh +++ /dev/null @@ -1,645 +0,0 @@ -#!/usr/bin/env bash - -initHostDistroRid() -{ - if [ "$__HostOS" == "Linux" ]; then - if [ ! -e /etc/os-release ]; then - echo "WARNING: Can not determine runtime id for current distro." - __HostDistroRid="" - else - source /etc/os-release - __HostDistroRid="$ID.$VERSION_ID-$__HostArch" - fi - fi -} - -initTargetDistroRid() -{ - if [ $__CrossBuild == 1 ]; then - if [ "$__BuildOS" == "Linux" ]; then - if [ ! -e $ROOTFS_DIR/etc/os-release ]; then - echo "WARNING: Can not determine runtime id for current distro." - export __DistroRid="" - else - source $ROOTFS_DIR/etc/os-release - export __DistroRid="$ID.$VERSION_ID-$__BuildArch" - fi - fi - else - export __DistroRid="$__HostDistroRid" - fi - - # Portable builds target the base RID - if [ "$__PortableBuild" == 1 ]; then - if [ "$__BuildOS" == "Linux" ]; then - export __DistroRid="linux-$__BuildArch" - elif [ "$__BuildOS" == "OSX" ]; then - export __DistroRid="osx-$__BuildArch" - fi - fi -} - -isMSBuildOnNETCoreSupported() -{ - # This needs to be updated alongwith corresponding changes to netci.groovy. - __isMSBuildOnNETCoreSupported=0 - - if [ "$__HostArch" == "x64" ]; then - if [ "$__HostOS" == "Linux" ]; then - case "$__HostDistroRid" in - "centos.7-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "debian.8-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "fedora.23-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "fedora.24-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "opensuse.42.1-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "rhel.7"*"-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "ubuntu.14.04-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "ubuntu.16.04-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "ubuntu.16.10-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "alpine.3.4.3-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - *) - __isMSBuildOnNETCoreSupported=$__msbuildonunsupportedplatform - esac - elif [ "$__HostOS" == "OSX" ]; then - __isMSBuildOnNETCoreSupported=1 - fi - fi -} - -build_Tests() -{ - __TestDir=$__ProjectDir/tests - __ProjectFilesDir=$__TestDir - __TestBinDir=$__TestWorkingDir - - if [ $__RebuildTests -ne 0 ]; then - if [ -d "${__TestBinDir}" ]; then - echo "Removing tests build dir: ${__TestBinDir}" - rm -rf $__TestBinDir - fi - fi - - __CMakeBinDir="${__TestBinDir}" - - if [ -z "$__TestIntermediateDir" ]; then - __TestIntermediateDir="tests/obj/${__BuildOS}.${__BuildArch}.${__BuildType}" - fi - - echo "__BuildOS: ${__BuildOS}" - echo "__BuildArch: ${__BuildArch}" - echo "__BuildType: ${__BuildType}" - echo "__TestIntermediateDir: ${__TestIntermediateDir}" - - if [ ! -f "$__TestBinDir" ]; then - echo "Creating TestBinDir: ${__TestBinDir}" - mkdir -p $__TestBinDir - fi - if [ ! -f "$__LogsDir" ]; then - echo "Creating LogsDir: ${__LogsDir}" - mkdir -p $__LogsDir - fi - - __BuildProperties="-p:OSGroup=${__BuildOS} -p:BuildOS=${__BuildOS} -p:BuildArch=${__BuildArch} -p:BuildType=${__BuildType}" - - # ========================================================================================= - # === - # === Restore product binaries from packages - # === - # ========================================================================================= - - if [ -z "$XunitTestBinBase"]; then - XunitTestBinBase="$__TestWorkingDir" - fi - - export CORE_ROOT="$XunitTestBinBase/Tests/Core_Root" - - if [ ! -f "${CORE_ROOT}" ]; then - mkdir -p ${CORE_ROOT} - else - rm -rf ${CORE_ROOT} - fi - - cp -r $__BinDir/* $CORE_ROOT/ > /dev/null - - # make sure the correct ilasm will be used - export CscToolPath="${CORE_ROOT}" - - build_Tests_internal "Restore_Product" "${__ProjectDir}/tests/build.proj" " -BatchRestorePackages" "Restore product binaries (build tests)" - - build_Tests_internal "Tests_GenerateRuntimeLayout" "${__ProjectDir}/tests/runtest.proj" "-BinPlaceRef -BinPlaceProduct -CopyCrossgenToProduct" "Restore product binaries (run tests)" - - if [ -n "$__UpdateInvalidPackagesArg" ]; then - __up=-updateinvalidpackageversion - fi - - # Work hardcoded path around - if [ ! -f "${__BuildToolsDir}/Microsoft.CSharp.Core.Targets" ]; then - ln -s "${__BuildToolsDir}/Microsoft.CSharp.Core.targets" "${__BuildToolsDir}/Microsoft.CSharp.Core.Targets" - fi - if [ ! -f "${__BuildToolsDir}/Microsoft.CSharp.targets" ]; then - ln -s "${__BuildToolsDir}/Microsoft.CSharp.Targets" "${__BuildToolsDir}/Microsoft.CSharp.targets" - fi - - echo "Starting the Managed Tests Build..." - - __ManagedTestBuiltMarker=${__TestBinDir}/managed_test_build - - if [ ! -f $__ManagedTestBuiltMarker ]; then - - build_Tests_internal "Tests_Managed" "$__ProjectDir/tests/build.proj" "$__up" "Managed tests build (build tests)" - - if [ $? -ne 0 ]; then - echo "${__MsgPrefix}Error: build failed. Refer to the build log files for details (above)" - exit 1 - else - echo "Tests have been built." - echo "Create marker \"${__ManagedTestBuiltMarker}\"" - touch $__ManagedTestBuiltMarker - fi - else - echo "Managed Tests had been built before." - fi - - if [ $__BuildTestWrappers -ne -0 ]; then - echo "${__MsgPrefix}Creating test wrappers..." - - __XUnitWrapperBuiltMarker=${__TestBinDir}/xunit_wrapper_build - - if [ ! -f $__XUnitWrapperBuiltMarker ]; then - - build_Tests_internal "Tests_XunitWrapper" "$__ProjectDir/tests/runtest.proj" "-BuildWrappers -MsBuildEventLogging=\" \" " "Test Xunit Wrapper" - - if [ $? -ne 0 ]; then - echo "${__MsgPrefix}Error: build failed. Refer to the build log files for details (above)" - exit 1 - else - echo "XUnit Wrappers have been built." - echo "Create marker \"${__XUnitWrapperBuiltMarker}\"" - touch $__XUnitWrapperBuiltMarker - fi - else - echo "XUnit Wrappers had been built before." - fi - fi - - echo "${__MsgPrefix}Creating test overlay..." - - build_Tests_internal "Tests_Overlay_Managed" "$__ProjectDir/tests/runtest.proj" "-testOverlay" "Creating test overlay" - - if [ $__ZipTests -ne 0 ]; then - echo "${__MsgPrefix}ZIP tests packages..." - build_Tests_internal "Helix_Prep" "$__ProjectDir/tests/helixprep.proj" " " "Prep test binaries for Helix publishing" - fi -} - -build_Tests_internal() -{ - subDirectoryName=$1 - projectName=$2 - extraBuildParameters=$3 - stepName="$4" - - # Set up directories and file names - __BuildLogRootName=$subDirectoryName - __BuildLog="$__LogsDir/${__BuildLogRootName}.${__BuildOS}.${__BuildArch}.${__BuildType}.log" - __BuildWrn="$__LogsDir/${__BuildLogRootName}.${__BuildOS}.${__BuildArch}.${__BuildType}.wrn" - __BuildErr="$__LogsDir/${__BuildLogRootName}.${__BuildOS}.${__BuildArch}.${__BuildType}.err" - __msbuildLog="\"/flp:Verbosity=normal;LogFile=${__BuildLog}\"" - __msbuildWrn="\"/flp1:WarningsOnly;LogFile=${__BuildWrn}\"" - __msbuildErr="\"/flp2:ErrorsOnly;LogFile=${__BuildErr}\"" - - # Generate build command - buildCommand="$__ProjectRoot/run.sh build -Project=$projectName -MsBuildLog=${__msbuildLog} -MsBuildWrn=${__msbuildWrn} -MsBuildErr=${__msbuildErr} $extraBuildParameters $__RunArgs $__UnprocessedBuildArgs" - - echo "Building step '$stepName' via $buildCommand" - - # Invoke MSBuild - eval $buildCommand - - # Invoke MSBuild - # $__ProjectRoot/run.sh build -Project=$projectName -MsBuildLog="$__msbuildLog" -MsBuildWrn="$__msbuildWrn" -MsBuildErr="$__msbuildErr" $extraBuildParameters $__RunArgs $__UnprocessedBuildArgs - - # Make sure everything is OK - if [ $? -ne 0 ]; then - echo "${__MsgPrefix}Failed to build $stepName. See the build logs:" - echo " $__BuildLog" - echo " $__BuildWrn" - echo " $__BuildErr" - exit 1 - fi -} - -usage() -{ - echo "Usage: $0 [BuildArch] [BuildType] [verbose] [coverage] [cross] [clangx.y] [ninja] [runtests] [bindir]" - echo "BuildArch can be: x64, x86, arm, armel, arm64" - echo "BuildType can be: debug, checked, release" - echo "coverage - optional argument to enable code coverage build (currently supported only for Linux and OSX)." - echo "ninja - target ninja instead of GNU make" - echo "clangx.y - optional argument to build using clang version x.y." - echo "cross - optional argument to signify cross compilation," - echo " - will use ROOTFS_DIR environment variable if set." - echo "crosscomponent - optional argument to build cross-architecture component," - echo " - will use CAC_ROOTFS_DIR environment variable if set." - echo "portableLinux - build for Portable Linux Distribution" - echo "verbose - optional argument to enable verbose build output." - echo "rebuild - if tests have already been built - rebuild them" - echo "runtests - run tests after building them" - echo "ziptests - zips CoreCLR tests & Core_Root for a Helix run" - echo "bindir - output directory (defaults to $__ProjectRoot/bin)" - echo "msbuildonunsupportedplatform - build managed binaries even if distro is not officially supported." - exit 1 -} - - -# Obtain the location of the bash script to figure out where the root of the repo is. -__ProjectRoot="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# $__ProjectRoot/build.sh $1 $2 - -# Use uname to determine what the CPU is. -CPUName=$(uname -p) - -# Some Linux platforms report unknown for platform, but the arch for machine. -if [ "$CPUName" == "unknown" ]; then - CPUName=$(uname -m) -fi - -case $CPUName in - i686) - echo "Unsupported CPU $CPUName detected, build might not succeed!" - __BuildArch=x86 - __HostArch=x86 - ;; - - x86_64) - __BuildArch=x64 - __HostArch=x64 - ;; - - armv7l) - echo "Unsupported CPU $CPUName detected, build might not succeed!" - __BuildArch=arm - __HostArch=arm - ;; - - aarch64) - __BuildArch=arm64 - __HostArch=arm64 - ;; - - *) - echo "Unknown CPU $CPUName detected, configuring as if for x64" - __BuildArch=x64 - __HostArch=x64 - ;; -esac - -# Use uname to determine what the OS is. -OSName=$(uname -s) -case $OSName in - Linux) - __BuildOS=Linux - __HostOS=Linux - ;; - - Darwin) - __BuildOS=OSX - __HostOS=OSX - ;; - - FreeBSD) - __BuildOS=FreeBSD - __HostOS=FreeBSD - ;; - - OpenBSD) - __BuildOS=OpenBSD - __HostOS=OpenBSD - ;; - - NetBSD) - __BuildOS=NetBSD - __HostOS=NetBSD - ;; - - SunOS) - __BuildOS=SunOS - __HostOS=SunOS - ;; - - *) - echo "Unsupported OS $OSName detected, configuring as if for Linux" - __BuildOS=Linux - __HostOS=Linux - ;; -esac - -__BuildType=Debug -__CodeCoverage= -__IncludeTests=INCLUDE_TESTS - -# Set the various build properties here so that CMake and MSBuild can pick them up -export __ProjectDir="$__ProjectRoot" -__SourceDir="$__ProjectDir/src" -__PackagesDir="$__ProjectDir/packages" -__RootBinDir="$__ProjectDir/bin" -__BuildToolsDir="$__ProjectDir/Tools" -__UnprocessedBuildArgs= -__RunArgs= -__MSBCleanBuildArgs= -__UseNinja=0 -__VerboseBuild=0 -__SkipRestore="" -__CrossBuild=0 -__ClangMajorVersion=0 -__ClangMinorVersion=0 -__NuGetPath="$__PackagesDir/NuGet.exe" -__HostDistroRid="" -__DistroRid="" -__cmakeargs="" -__PortableLinux=0 -__msbuildonunsupportedplatform=0 -__ZipTests=0 -__NativeTestIntermediatesDir= -__RunTests=0 -__RebuildTests=0 -__BuildTestWrappers=0 -CORE_ROOT= - - -while :; do - if [ $# -le 0 ]; then - break - fi - - lowerI="$(echo $1 | awk '{print tolower($0)}')" - case $lowerI in - -\?|-h|--help) - usage - exit 1 - ;; - - x86) - __BuildArch=x86 - ;; - - x64) - __BuildArch=x64 - ;; - - arm) - __BuildArch=arm - ;; - - armel) - __BuildArch=armel - ;; - - arm64) - __BuildArch=arm64 - ;; - - debug) - __BuildType=Debug - ;; - - checked) - __BuildType=Checked - ;; - - release) - __BuildType=Release - ;; - - coverage) - __CodeCoverage=Coverage - ;; - - cross) - __CrossBuild=1 - ;; - - portablelinux) - if [ "$__BuildOS" == "Linux" ]; then - __PortableLinux=1 - else - echo "ERROR: portableLinux not supported for non-Linux platforms." - exit 1 - fi - ;; - - verbose) - __VerboseBuild=1 - ;; - - clang3.5) - __ClangMajorVersion=3 - __ClangMinorVersion=5 - ;; - - clang3.6) - __ClangMajorVersion=3 - __ClangMinorVersion=6 - ;; - - clang3.7) - __ClangMajorVersion=3 - __ClangMinorVersion=7 - ;; - - clang3.8) - __ClangMajorVersion=3 - __ClangMinorVersion=8 - ;; - - clang3.9) - __ClangMajorVersion=3 - __ClangMinorVersion=9 - ;; - - ninja) - __UseNinja=1 - ;; - - runtests) - __RunTests=1 - ;; - - rebuild) - __RebuildTests=1 - ;; - - ziptests) - __ZipTests=1 - ;; - - bindir) - if [ -n "$2" ]; then - __RootBinDir="$2" - if [ ! -d $__RootBinDir ]; then - mkdir $__RootBinDir - fi - __RootBinParent=$(dirname $__RootBinDir) - __RootBinName=${__RootBinDir##*/} - __RootBinDir="$(cd $__RootBinParent &>/dev/null && printf %s/%s $PWD $__RootBinName)" - shift - else - echo "ERROR: 'bindir' requires a non-empty option argument" - exit 1 - fi - ;; - - msbuildonunsupportedplatform) - __msbuildonunsupportedplatform=1 - ;; - *) - __UnprocessedBuildArgs="$__UnprocessedBuildArgs $1" - ;; - esac - - shift -done - - -__RunArgs="-BuildArch=$__BuildArch -BuildType=$__BuildType -BuildOS=$__BuildOS" - -# Configure environment if we are doing a verbose build -if [ $__VerboseBuild == 1 ]; then - export VERBOSE=1 - __RunArgs="$__RunArgs -verbose" -fi - -# Set default clang version -if [[ $__ClangMajorVersion == 0 && $__ClangMinorVersion == 0 ]]; then - if [ $__CrossBuild == 1 ]; then - __ClangMajorVersion=3 - __ClangMinorVersion=6 - else - __ClangMajorVersion=3 - __ClangMinorVersion=5 - fi -fi - - -# Set dependent variables -__LogsDir="$__RootBinDir/Logs" - -# init the host distro name -initHostDistroRid - -# Set the remaining variables based upon the determined build configuration -__BinDir="$__RootBinDir/Product/$__BuildOS.$__BuildArch.$__BuildType" -__PackagesBinDir="$__BinDir/.nuget" -__ToolsDir="$__RootBinDir/tools" -__TestDir="$__ProjectDir/tests" -__TestWorkingDir="$__RootBinDir/tests/$__BuildOS.$__BuildArch.$__BuildType" -__IntermediatesDir="$__RootBinDir/obj/$__BuildOS.$__BuildArch.$__BuildType" -__TestIntermediatesDir="$__RootBinDir/tests/obj/$__BuildOS.$__BuildArch.$__BuildType" -__isMSBuildOnNETCoreSupported=0 -__CrossComponentBinDir="$__BinDir" -__CrossCompIntermediatesDir="$__IntermediatesDir/crossgen" - -__CrossArch="$__HostArch" -if [[ "$__HostArch" == "x64" && "$__BuildArch" == "arm" ]]; then - __CrossArch="x86" -fi -if [ $__CrossBuild == 1 ]; then - __CrossComponentBinDir="$__CrossComponentBinDir/$__CrossArch" -fi -__CrossgenCoreLibLog="$__LogsDir/CrossgenCoreLib_$__BuildOS.$BuildArch.$__BuildType.log" -__CrossgenExe="$__CrossComponentBinDir/crossgen" - -isMSBuildOnNETCoreSupported - -# CI_SPECIFIC - On CI machines, $HOME may not be set. In such a case, create a subfolder and set the variable to set. -# This is needed by CLI to function. -if [ -z "$HOME" ]; then - if [ ! -d "$__ProjectDir/temp_home" ]; then - mkdir temp_home - fi - export HOME=$__ProjectDir/temp_home - echo "HOME not defined; setting it to $HOME" -fi - -# Specify path to be set for CMAKE_INSTALL_PREFIX. -# This is where all built CoreClr libraries will copied to. -export __CMakeBinDir="$__BinDir" - -if [ ! -d "$__BinDir" ] || [ ! -d "$__BinDir/bin" ]; then - - echo "Has not been found built CoreCLR instance" - echo "Please build it before tests using './build.sh $__BuildArch $__BuildType'" - exit 1 -fi - -# Configure environment if we are doing a cross compile. -if [ $__CrossBuild == 1 ]; then - export CROSSCOMPILE=1 - if ! [[ -n "$ROOTFS_DIR" ]]; then - export ROOTFS_DIR="$__ProjectRoot/cross/rootfs/$__BuildArch" - fi -fi - -# init the target distro name -initTargetDistroRid - -# Override tool directory - -__CoreClrVersion=1.1.0 -__sharedFxDir=$__BuildToolsDir/dotnetcli/shared/Microsoft.NETCore.App/$__CoreClrVersion/ - -echo "Building Tests..." - -build_Tests - -if [ $? -ne 0 ]; then - echo "Failed to build tests" - exit 1 -fi - -echo "${__MsgPrefix}Test build successful." -echo "${__MsgPrefix}Test binaries are available at ${__TestBinDir}" - -__testNativeBinDir=$__IntermediatesDir/tests - -if [ $__RunTests -ne 0 ]; then - - echo "Run Tests..." - - echo "${__TestDir}/runtest.sh --testRootDir=$__TestBinDir --coreClrBinDir=$__BinDir --coreFxBinDir=$__sharedFxDir --testNativeBinDir=$__testNativeBinDir" - - $__TestDir/runtest.sh --testRootDir=$__TestBinDir --coreClrBinDir=$__BinDir --coreFxBinDir=$CORE_ROOT --testNativeBinDir=$__testNativeBinDir - - echo "Tests run successful." -else - echo "To run all tests use 'tests/runtests.sh' where:" - echo " testRootDir = $__TestBinDir" - echo " coreClrBinDir = $__BinDir" - echo " coreFxBinDir = $CORE_ROOT" - echo " testNativeBinDir = $__testNativeBinDir" - echo " -------------------------------------------------- " - echo "To run single test use the following command:" - echo " bash ${__TestBinDir}/__TEST_PATH__/__TEST_NAME__.sh -coreroot=${CORE_ROOT}" -fi - diff --git a/build.sh b/build.sh index e280125..39e96dd 100755 --- a/build.sh +++ b/build.sh @@ -278,7 +278,7 @@ build_native() pushd "$intermediatesForBuild" # Regenerate the CMake solution echo "Invoking \"$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh\" \"$__ProjectRoot\" $__ClangMajorVersion $__ClangMinorVersion $platformArch $__BuildType $__CodeCoverage $__IncludeTests $generator $extraCmakeArguments $__cmakeargs" - "$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh" "$__ProjectRoot" $__ClangMajorVersion $__ClangMinorVersion $platformArch $__BuildType $__CodeCoverage "$__IncludeTests" $generator "$extraCmakeArguments" "$__cmakeargs" + "$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh" "$__ProjectRoot" $__ClangMajorVersion $__ClangMinorVersion $platformArch $__BuildType $__CodeCoverage $__IncludeTests $generator "$extraCmakeArguments" "$__cmakeargs" popd fi @@ -338,6 +338,7 @@ build_cross_arch_component() export __CMakeBinDir="$__CrossComponentBinDir" export CROSSCOMPONENT=1 + __IncludeTests= if [ $CROSSCOMPILE == 1 ]; then TARGET_ROOTFS="$ROOTFS_DIR" @@ -586,7 +587,7 @@ esac __BuildType=Debug __CodeCoverage= -__IncludeTests=INCLUDE_TESTS +__IncludeTests=Include_Tests # Set the various build properties here so that CMake and MSBuild can pick them up __ProjectDir="$__ProjectRoot" diff --git a/dependencies.props b/dependencies.props index d3df2d6..1da0a32 100644 --- a/dependencies.props +++ b/dependencies.props @@ -1,4 +1,3 @@ - diff --git a/dir.props b/dir.props index 9bbd89f..cac0ace 100644 --- a/dir.props +++ b/dir.props @@ -26,11 +26,7 @@ as well as runnning the build on mono. Until we can get these sorted out we will continue using the .NET 4.5 version of the tasks. --> - false - true - false - true - $(BuildToolsTargetsDesktop) + true @@ -46,7 +42,7 @@ Checked $(__BuildOS) - AnyOS + Windows_NT $(__ProjectDir)\ $(MSBuildThisFileDirectory) @@ -72,8 +68,8 @@ $(__PackagesBinDir) $(BinDir).nuget\ - $(ProjectDir)Tools\ - $(ToolsDir)dotnetcli\ + $(ProjectDir)Tools/ + $(ToolsDir)dotnetcli/ $(DotnetCliPath)dotnet $(ToolsDir)Microsoft.DotNet.Build.Tasks.dll diff --git a/init-tools.sh b/init-tools.sh index c076212..b676ba1 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -16,8 +16,7 @@ __INIT_TOOLS_DONE_MARKER=$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION/done if [ -z "$__DOTNET_PKG" ]; then if [ "$(uname -m | grep "i[3456]86")" = "i686" ]; then - echo "Error: build not supported on 32 bit Unix" - exit 1 + echo "Warning: build not supported on 32 bit Unix" fi OSName=$(uname -s) case $OSName in diff --git a/src/build.proj b/src/build.proj index efe3554..7962d27 100644 --- a/src/build.proj +++ b/src/build.proj @@ -1,4 +1,3 @@ - diff --git a/tests/build.proj b/tests/build.proj index 7897a3f..066f2a2 100644 --- a/tests/build.proj +++ b/tests/build.proj @@ -35,13 +35,12 @@ - - + - Unix $(OS) @@ -18,15 +16,10 @@ - - false - true - false - true - $(BuildToolsTargetsDesktop) - true - + --> + + true + @@ -35,15 +28,8 @@ $(ProjectDir)src\ $(ProjectDir)..\packages\ $(ProjectDir)..\Tools\ - $(ToolsDir)dotnetcli\ - $(ToolsDir)net46\ - $(DotnetCliPath)dotnet - $(ToolsDir)\Microsoft.CSharp.Core.targets - - <_TargetFrameworkDirectories Condition="'$(BuildToolsTargetsDesktop)' != 'true'">$(MSBuildThisFileDirectory)/Documentation - <_FullFrameworkReferenceAssemblyPaths Condition="'$(BuildToolsTargetsDesktop)' != 'true'">$(MSBuildThisFileDirectory)/Documentation - true + $(ToolsDir)dotnetcli/ + $(ToolsDir)net46/ true @@ -51,10 +37,6 @@ $(__RootBinDir)\ $(ProjectDir)..\bin\ - - $(__BinDir)\ - $(RootBinDir)Product\$(BuildOS).$(BuildArch).$(BuildType)\ - diff --git a/tests/helixperftasks.targets b/tests/helixperftasks.targets index 3131968..d578360 100644 --- a/tests/helixperftasks.targets +++ b/tests/helixperftasks.targets @@ -1,4 +1,3 @@ - diff --git a/tests/helixprep.proj b/tests/helixprep.proj index f14879b..2d08e91 100644 --- a/tests/helixprep.proj +++ b/tests/helixprep.proj @@ -1,4 +1,3 @@ - diff --git a/tests/helixpublish.proj b/tests/helixpublish.proj index a68f1f7..fd9713e 100644 --- a/tests/helixpublish.proj +++ b/tests/helixpublish.proj @@ -1,4 +1,3 @@ - diff --git a/tests/override.targets b/tests/override.targets index 483c837..0e7f82b 100644 --- a/tests/override.targets +++ b/tests/override.targets @@ -1,4 +1,3 @@ - + + + + - + diff --git a/tests/src/CLRTest.Jit.targets b/tests/src/CLRTest.Jit.targets index b1da9fc..1dd872c 100644 --- a/tests/src/CLRTest.Jit.targets +++ b/tests/src/CLRTest.Jit.targets @@ -23,11 +23,9 @@ WARNING: When setting properties based on their current state (for example: - $([MSBuild]::MakeRelative($(OutputPath.Replace("/","\\")), $(_CLRTestToRunFileFullPath.Replace("/","\\"))).Replace("\\","/")) - $([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath))) + $([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)).Replace("\","/")) $(MSBuildProjectName).exe - $([MSBuild]::MakeRelative($(OutputPath.Replace("/","\\")), $(BaseOutputPathWithConfig.Replace("/","\\"))dasm\$(BuildProjectRelativeDir.Replace("/","\\"))).Replace("\\","/")) - $([MSBuild]::MakeRelative($(OutputPath), $(BaseOutputPathWithConfig)dasm\$(BuildProjectRelativeDir))) + $([MSBuild]::MakeRelative($(OutputPath), $(BaseOutputPathWithConfig)dasm\$(BuildProjectRelativeDir)).Replace("\","/")) - $([MSBuild]::MakeRelative($(OutputPath.Replace("/","\\")), $(_CLRTestToRunFileFullPath.Replace("/","\\"))).Replace("\\","/")) - $([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath))) + $([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath))) $(MSBuildProjectName).exe - $([MSBuild]::MakeRelative($(OutputPath.Replace("/","\\")), $(BaseOutputPathWithConfig.Replace("/","\\"))dasm\$(BuildProjectRelativeDir.Replace("/","\\"))).Replace("\\","/")) - $([MSBuild]::MakeRelative($(OutputPath), $(BaseOutputPathWithConfig)dasm\$(BuildProjectRelativeDir))) + $([MSBuild]::MakeRelative($(OutputPath), $(BaseOutputPathWithConfig)dasm\$(BuildProjectRelativeDir))) - $([MSBuild]::MakeRelative($(OutputPath.Replace("/","\\")), $(_CLRTestToRunFileFullPath.Replace("/","\\"))).Replace("\\","/")) - $([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath))) + $([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)).Replace("\","/")) $(MSBuildProjectName).exe $(MSBuildProjectName).dasm.il $(MSBuildProjectName).asm.exe @@ -181,4 +176,4 @@ export COMPlus_GCStress=$(RunWithGcStress) - \ No newline at end of file + diff --git a/tests/src/GC/LargeMemory/API/gc/memcheck.csproj b/tests/src/GC/LargeMemory/API/gc/memcheck.csproj index 49e4f02..e982e5f 100644 --- a/tests/src/GC/LargeMemory/API/gc/memcheck.csproj +++ b/tests/src/GC/LargeMemory/API/gc/memcheck.csproj @@ -24,7 +24,7 @@ - + diff --git a/tests/src/GC/LargeMemory/Allocation/memcheck.csproj b/tests/src/GC/LargeMemory/Allocation/memcheck.csproj index 49e4f02..e982e5f 100644 --- a/tests/src/GC/LargeMemory/Allocation/memcheck.csproj +++ b/tests/src/GC/LargeMemory/Allocation/memcheck.csproj @@ -24,7 +24,7 @@ - + diff --git a/tests/src/IL.targets b/tests/src/IL.targets index c63ce98..36cff53 100644 --- a/tests/src/IL.targets +++ b/tests/src/IL.targets @@ -11,12 +11,8 @@ Returns="" DependsOnTargets="$(CoreCompileDependsOn)"> - <_ShellKeyMarker Condition="'$(BuildOS)' != 'Windows_NT'">- - <_ShellKeyMarker Condition="'$(BuildOS)' == 'Windows_NT'">/ - <_ilasm>ilasm - <_ilasm Condition="'$(CORE_ROOT)' != ''">$(CORE_ROOT)/ilasm - <_OutputTypeArgument Condition="'$(OutputType)' == 'Library'">$(_ShellKeyMarker)DLL - <_OutputTypeArgument Condition="'$(OutputType)' == 'Exe'">$(_ShellKeyMarker)EXE + <_OutputTypeArgument Condition="'$(OutputType)' == 'Library'">/DLL + <_OutputTypeArgument Condition="'$(OutputType)' == 'Exe'">/EXE <_IlasmSwitches>-QUIET -NOLOGO <_IlasmSwitches Condition="'$(FoldIdenticalMethods)' == 'True'">$(_IlasmSwitches) -FOLD <_IlasmSwitches Condition="'$(SizeOfStackReserve)' != ''">$(_IlasmSwitches) -STACK=$(SizeOfStackReserve) @@ -26,7 +22,7 @@ <_IlasmSwitches Condition="'$(Optimize)' == 'True'">$(_IlasmSwitches) -OPTIMIZE - + diff --git a/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj b/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj index 144cfce..9fe1293 100644 --- a/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj +++ b/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj @@ -25,7 +25,7 @@ - + diff --git a/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj b/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj index 59f063e..ea51f6e 100644 --- a/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj +++ b/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj @@ -25,7 +25,7 @@ - + diff --git a/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj b/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj index 62ffb83..7b74c27 100644 --- a/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj +++ b/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj @@ -27,7 +27,7 @@ true - + diff --git a/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj b/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj index 793183d..6e3f861 100644 --- a/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj +++ b/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj @@ -25,7 +25,7 @@ - + diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj index 6bcb7a0..a009a89 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj @@ -25,7 +25,7 @@ - + diff --git a/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj b/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj index 7cff691..fc95236 100644 --- a/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj +++ b/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj @@ -25,7 +25,7 @@ - + diff --git a/tests/src/JIT/opt/Devirtualization/GitHub_9945.csproj b/tests/src/JIT/opt/Devirtualization/GitHub_9945.csproj index eacc9fc..5d417dc 100644 --- a/tests/src/JIT/opt/Devirtualization/GitHub_9945.csproj +++ b/tests/src/JIT/opt/Devirtualization/GitHub_9945.csproj @@ -10,7 +10,6 @@ Exe {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} ..\..\ - true diff --git a/tests/src/JIT/opt/Devirtualization/comparable.csproj b/tests/src/JIT/opt/Devirtualization/comparable.csproj index 85825a9..780cd91 100644 --- a/tests/src/JIT/opt/Devirtualization/comparable.csproj +++ b/tests/src/JIT/opt/Devirtualization/comparable.csproj @@ -1,4 +1,4 @@ - + diff --git a/tests/src/NuGet.Config b/tests/src/NuGet.Config index 7d6ce42..0922300 100644 --- a/tests/src/NuGet.Config +++ b/tests/src/NuGet.Config @@ -6,7 +6,6 @@ - diff --git a/tests/src/dir.common.props b/tests/src/dir.common.props index 2443e1c..5a7ee2e 100644 --- a/tests/src/dir.common.props +++ b/tests/src/dir.common.props @@ -1,4 +1,3 @@ - @@ -6,7 +5,7 @@ <__BuildArch Condition="'$(__BuildArch)' == ''">x64 <__BuildType Condition="'$(__BuildType)' == ''">Debug - <__BuildOS Condition="'$(__BuildOS)' == ''">AnyOS + <__BuildOS Condition="'$(__BuildOS)' == ''">Windows_NT $(__BuildArch) $(__BuildType) $(__BuildOS) @@ -38,7 +37,7 @@ $(BuildOS).$(Platform).$(Configuration) $(ProjectDir)\..\bin\tests - $(__TestRootDir) + $(__TestRootDir)\ $(BaseOutputPath)\$(OSPlatformConfig)\ $(BaseOutputPathWithConfig) $(ProjectDir)\..\bin\tests\obj\$(OSPlatformConfig)\Managed\ diff --git a/tests/src/dir.props b/tests/src/dir.props index 0ccd6e9..abad765 100644 --- a/tests/src/dir.props +++ b/tests/src/dir.props @@ -1,4 +1,3 @@ - @@ -19,11 +18,11 @@ - Windows_NT - Linux - OSX - FreeBSD - AnyOS + Windows_NT + Linux + OSX + FreeBSD + Windows_NT diff --git a/tests/src/dir.targets b/tests/src/dir.targets index 5b9082d2..4e6c618 100644 --- a/tests/src/dir.targets +++ b/tests/src/dir.targets @@ -1,4 +1,3 @@ - @@ -104,8 +103,10 @@ CSharp + + - - + - + diff --git a/tests/src/dirs.proj b/tests/src/dirs.proj index 215ce84..6ae2b7c 100644 --- a/tests/src/dirs.proj +++ b/tests/src/dirs.proj @@ -1,4 +1,3 @@ - @@ -15,10 +14,10 @@ - + - - + + @@ -26,114 +25,11 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/testsFailingOutsideWindows.txt b/tests/testsFailingOutsideWindows.txt index 7417d28..3b59343 100644 --- a/tests/testsFailingOutsideWindows.txt +++ b/tests/testsFailingOutsideWindows.txt @@ -1,4 +1,3 @@ -baseservices/threading/paramthreadstart/ThreadStartBool_1/ThreadStartBool_1.sh baseservices/threading/paramthreadstart/ThreadStartString_1/ThreadStartString_1.sh CoreMangLib/cti/system/multicastdelegate/MulticastDelegateCtor/MulticastDelegateCtor.sh CoreMangLib/cti/system/runtime/interopservices/marshal/MarshalGetLastWin32Error_PSC/MarshalGetLastWin32Error_PSC.sh -- 2.7.4