summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/building/unix-test-instructions.md3
-rwxr-xr-xnetci.groovy13
-rwxr-xr-xtests/runtest.sh37
3 files changed, 11 insertions, 42 deletions
diff --git a/Documentation/building/unix-test-instructions.md b/Documentation/building/unix-test-instructions.md
index 9cf7507443..563c3e8c68 100644
--- a/Documentation/building/unix-test-instructions.md
+++ b/Documentation/building/unix-test-instructions.md
@@ -36,8 +36,7 @@ Run tests (`Debug` may be replaced with `Release` or `Checked`, depending on whi
> --testNativeBinDir=~/coreclr/bin/obj/Linux.x64.Debug/tests
> --coreClrBinDir=~/coreclr/bin/Product/Linux.x64.Debug
> --mscorlibDir=/media/coreclr/bin/Product/Linux.x64.Debug
-> --coreFxBinDir="~/corefx/bin/Linux.AnyCPU.Debug;~/corefx/bin/Unix.AnyCPU.Debug;~/corefx/bin/AnyOS.AnyCPU.Debug"
-> --coreFxNativeBinDir=~/corefx/bin/Linux.x64.Debug
+> --coreFxBinDir=~/corefx/bin/runtime/netcoreapp-Linux-Debug-x64
> ```
The method above will copy dependencies from the set of directories provided to create an 'overlay' directory.
diff --git a/netci.groovy b/netci.groovy
index 6203a03888..313cd565ba 100755
--- a/netci.groovy
+++ b/netci.groovy
@@ -2467,7 +2467,7 @@ combinedScenarios.each { scenario ->
copyArtifacts("${corefxFolder}/linuxarmemulator_softfp_cross_${lowerConfiguration}") {
includePatterns('bin/build.tar.gz')
buildSelector {
- latestSaved()
+ latestSuccessful(true)
}
}
}
@@ -2787,9 +2787,6 @@ combinedScenarios.each { scenario ->
// Get corefx
shell("git clone https://github.com/dotnet/corefx fx")
- // CoreFX is changing their output format and scripts, pick a stable version until all that work has landed.
- shell("git -C ./fx checkout 551fe49174378adcbf785c0ab12fc69355cef6e8")
-
// Build Linux corefx
shell("./fx/build-native.sh -release -buildArch=x64 -os=Linux")
shell("./fx/build-managed.sh -release -buildArch=x64 -osgroup=Linux -skiptests")
@@ -2815,8 +2812,7 @@ combinedScenarios.each { scenario ->
--testNativeBinDir=\"\$(pwd)/clr/bin/obj/${osGroup}.${architecture}.${configuration}/tests\" \\
--coreClrBinDir=\"\$(pwd)/clr/bin/Product/${osGroup}.${architecture}.${configuration}\" \\
--mscorlibDir=\"\$(pwd)/clr/bin/Product/${osGroup}.${architecture}.${configuration}\" \\
- --coreFxBinDir=\"\$(pwd)/fx/bin/${osGroup}.AnyCPU.Release;\$(pwd)/fx/bin/Unix.AnyCPU.Release;\$(pwd)/fx/bin/AnyOS.AnyCPU.Release\" \\
- --coreFxNativeBinDir=\"\$(pwd)/fx/bin/${osGroup}.${architecture}.Release\" \\
+ --coreFxBinDir=\"\$(pwd)/fx/bin/runtime/netcoreapp-${osGroup}-${configuration}-${architecture}\" \\
--crossgen --runcrossgentests""")
// Run coreclr tests w/ server GC & HeapVerify enabled
@@ -2855,7 +2851,7 @@ combinedScenarios.each { scenario ->
copyArtifacts("${corefxFolder}/${osJobName}_release") {
includePatterns('bin/build.tar.gz')
buildSelector {
- latestSaved()
+ latestSuccessful(true)
}
}
@@ -2884,8 +2880,7 @@ combinedScenarios.each { scenario ->
--testNativeBinDir=\"\${WORKSPACE}/bin/obj/${osGroup}.${architecture}.${configuration}/tests\" \\
--coreClrBinDir=\"\${WORKSPACE}/bin/Product/${osGroup}.${architecture}.${configuration}\" \\
--mscorlibDir=\"\${WORKSPACE}/bin/Product/${osGroup}.${architecture}.${configuration}\" \\
- --coreFxBinDir=\"\${WORKSPACE}/bin/${osGroup}.AnyCPU.Release;\${WORKSPACE}/bin/Unix.AnyCPU.Release;\${WORKSPACE}/bin/AnyOS.AnyCPU.Release\" \\
- --coreFxNativeBinDir=\"\${WORKSPACE}/bin/${osGroup}.${architecture}.Release\" \\
+ --coreFxBinDir=\"\$(pwd)/fx/bin/runtime/netcoreapp-${osGroup}-${configuration}-${architecture}\" \\
--limitedDumpGeneration \\
${testEnvOpt} ${serverGCString} ${gcstressStr} ${crossgenStr} ${runcrossgentestsStr} ${runjitstressStr} ${runjitstressregsStr} ${runjitmioptsStr} ${runjitforcerelocsStr} ${runjitdisasmStr} ${sequentialString} ${playlistString}""")
}
diff --git a/tests/runtest.sh b/tests/runtest.sh
index b48cffb4a6..4db1ac3d88 100755
--- a/tests/runtest.sh
+++ b/tests/runtest.sh
@@ -11,8 +11,7 @@ function print_usage {
echo ' --testNativeBinDir="coreclr/bin/obj/Linux.x64.Debug/tests"'
echo ' --coreClrBinDir="coreclr/bin/Product/Linux.x64.Debug"'
echo ' --mscorlibDir="windows/coreclr/bin/Product/Linux.x64.Debug"'
- echo ' --coreFxBinDir="corefx/bin/Linux.AnyCPU.Debug"'
- echo ' --coreFxNativeBinDir="corefx/bin/Linux.x64.Debug"'
+ echo ' --coreFxBinDir="corefx/bin/runtime/netcoreapp-Linux-Debug-x64'
echo ''
echo 'Required arguments:'
echo ' --testRootDir=<path> : Root directory of the test build (e.g. coreclr/bin/tests/Windows_NT.x64.Debug).'
@@ -22,14 +21,13 @@ function print_usage {
echo 'Optional arguments:'
echo ' --coreOverlayDir=<path> : Directory containing core binaries and test dependencies. If not specified, the'
echo ' default is testRootDir/Tests/coreoverlay. This switch overrides --coreClrBinDir,'
- echo ' --mscorlibDir, --coreFxBinDir, and --coreFxNativeBinDir.'
+ echo ' --mscorlibDir, and --coreFxBinDir.'
echo ' --coreClrBinDir=<path> : Directory of the CoreCLR build (e.g. coreclr/bin/Product/Linux.x64.Debug).'
echo ' --mscorlibDir=<path> : Directory containing the built mscorlib.dll. If not specified, it is expected to be'
echo ' in the directory specified by --coreClrBinDir.'
- echo ' --coreFxBinDir="<path>[;<path>]" : List of one or more directories with CoreFX build outputs (semicolon-delimited)'
- echo ' (e.g. "corefx/bin/Linux.AnyCPU.Debug;corefx/bin/Unix.AnyCPU.Debug;corefx/bin/AnyOS.AnyCPU.Debug").'
+ echo ' --coreFxBinDir="<path>" : Directory with CoreFX build outputs'
+ echo ' (e.g. "corefx/bin/runtime/netcoreapp-Linux-Debug-x64")'
echo ' If files with the same name are present in multiple directories, the first one wins.'
- echo ' --coreFxNativeBinDir=<path> : Directory of the CoreFX native build (e.g. corefx/bin/Linux.x64.Debug).'
echo ' --testDir=<path> : Run tests only in the specified directory. The path is relative to the directory'
echo ' specified by --testRootDir. Multiple of this switch may be specified.'
echo ' --testDirFile=<path> : Run tests only in the directories specified by the file at <path>. Paths are listed'
@@ -97,6 +95,7 @@ xunitOutputPath=
xunitTestOutputPath=
# libExtension determines extension for dynamic library files
+# runtimeName determines where CoreFX Runtime files will be located
OSName=$(uname -s)
libExtension=
case $OSName in
@@ -353,12 +352,6 @@ function create_core_overlay {
if [ -z "$coreFxBinDir" ]; then
exit_with_error "$errorSource" "One of --coreOverlayDir or --coreFxBinDir must be specified." "$printUsage"
fi
- if [ -z "$coreFxNativeBinDir" ]; then
- exit_with_error "$errorSource" "One of --coreOverlayDir or --coreFxBinDir must be specified." "$printUsage"
- fi
- if [ ! -d "$coreFxNativeBinDir/Native" ]; then
- exit_with_error "$errorSource" "Directory specified by --coreNativeFxBinDir does not exist: $coreFxNativeBinDir/Native"
- fi
# Create the overlay
coreOverlayDir=$testRootDir/Tests/coreoverlay
@@ -368,21 +361,7 @@ function create_core_overlay {
fi
mkdir "$coreOverlayDir"
- while IFS=';' read -ra coreFxBinDirectories; do
- for currDir in "${coreFxBinDirectories[@]}"; do
- if [ ! -d "$currDir" ]; then
- exit_with_error "$errorSource" "Directory specified in --coreFxBinDir does not exist: $currDir"
- fi
- pushd $currDir > /dev/null
- for dirName in $(find . -iname '*.dll' \! -iwholename '*test*' \! -iwholename '*/ToolRuntime/*' \! -iwholename '*/RemoteExecutorConsoleApp/*' \! -iwholename '*/net*' \! -iwholename '*aot*' -exec dirname {} \; | uniq | sed 's/\.\/\(.*\)/\1/g'); do
- cp -n -v "$currDir/$dirName/$dirName.dll" "$coreOverlayDir/"
- done
- popd $currDur > /dev/null
- done
- done <<< $coreFxBinDir
-
- cp -f -v "$coreFxNativeBinDir/Native/"*."$libExtension" "$coreOverlayDir/" 2>/dev/null
-
+ cp -f -v "$coreFxBinDir/"* "$coreOverlayDir/" 2>/dev/null
cp -f -v "$coreClrBinDir/"* "$coreOverlayDir/" 2>/dev/null
cp -f -v "$mscorlibDir/mscorlib.dll" "$coreOverlayDir/" 2>/dev/null
if [ -d "$mscorlibDir/bin" ]; then
@@ -968,7 +947,6 @@ coreOverlayDir=
coreClrBinDir=
mscorlibDir=
coreFxBinDir=
-coreFxNativeBinDir=
coreClrObjs=
coreClrSrc=
coverageOutputDir=
@@ -1035,9 +1013,6 @@ do
--coreFxBinDir=*)
coreFxBinDir=${i#*=}
;;
- --coreFxNativeBinDir=*)
- coreFxNativeBinDir=${i#*=}
- ;;
--testDir=*)
testDirectories[${#testDirectories[@]}]=${i#*=}
;;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 20:53:47 +0000