Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Commit

Permalink
Skip runtime dependencies for arm32/arm64.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergey Andreenko committed Jun 13, 2019
1 parent 324ac2e commit a99b083
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 11 deletions.
2 changes: 1 addition & 1 deletion build-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ generate_layout()
cp -r $__BinDir/* $CORE_ROOT/ > /dev/null

if [ "$__BuildOS" != "OSX" ]; then
nextCommand="\"$__TestDir/setup-stress-dependencies.sh\" --outputDir=$CORE_ROOT"
nextCommand="\"$__TestDir/setup-stress-dependencies.sh\" --arch=$__BuildArch --outputDir=$CORE_ROOT"
echo "Resolve runtime dependences via $nextCommand"
eval $nextCommand
if [ $? != 0 ]; then
Expand Down
10 changes: 2 additions & 8 deletions tests/bringup_runtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1451,14 +1451,8 @@ else
load_failing_tests
fi

# Other architectures are not supported yet.
if [ "$ARCH" == "x64" ]
then
scriptPath=$(dirname $0)
${scriptPath}/setup-stress-dependencies.sh --outputDir=$coreOverlayDir
elif [ "$ARCH" != "arm64" ] && [ "$ARCH" != "arm" ]; then
echo "Skip preparing for GC stress test. Dependent package is not supported on this architecture."
fi
scriptPath=$(dirname $0)
${scriptPath}/setup-stress-dependencies.sh --arch=$ARCH --outputDir=$coreOverlayDir

export __TestEnv=$testEnv

Expand Down
19 changes: 17 additions & 2 deletions tests/setup-stress-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ function print_usage {
echo ''
echo 'Command line:'
echo ''
echo './setup-gcstress.sh --outputDir=<coredistools_lib_install_path>'
echo './setup-gcstress.sh --arch=<TargetArch> --outputDir=<coredistools_lib_install_path>'
echo ''
echo 'Required arguments:'
echo ' --arch=<TargetArch> : Target arch for the build'
echo ' --outputDir=<path> : Directory to install libcoredistools.so'
echo ''
}
Expand Down Expand Up @@ -55,6 +56,9 @@ do
-v|--verbose)
verbose=1
;;
--arch=*)
__BuildArch=${i#*=}
;;
--outputDir=*)
libInstallDir=${i#*=}
;;
Expand All @@ -66,12 +70,23 @@ do
esac
done

if [ -z "$__BuildArch" ]; then
echo "--arch is required."
print_usage
exit_with_error 1
fi

if [ -z "$libInstallDir" ]; then
echo "--libInstallDir is required."
echo "--outputDir is required."
print_usage
exit_with_error 1
fi

if [ "$__BuildArch" == "arm64" ] || [ "$__BuildArch" == "arm" ]
echo "No runtime dependencies for arm32/arm64"
exit $EXIT_CODE_SUCCESS
fi

# This script must be located in coreclr/tests.
scriptDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

Expand Down

0 comments on commit a99b083

Please sign in to comment.