diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2017-03-16 07:32:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 07:32:12 -0700 |
| commit | 84aab5f59d023849b9ccdc290e698e4a61ac75a2 (patch) | |
| tree | 5236a7bea31a0b7deefd1a4f181c2d6cb1ded1aa /tests/runtest.sh | |
| parent | 8f4861922d1761bfcb339d2474fd1b414cec8004 (diff) | |
| download | coreclr-84aab5f59d023849b9ccdc290e698e4a61ac75a2.tar.gz coreclr-84aab5f59d023849b9ccdc290e698e4a61ac75a2.tar.bz2 coreclr-84aab5f59d023849b9ccdc290e698e4a61ac75a2.zip | |
Delete mscorlib facade (#10157)
Fixes #7607
Diffstat (limited to 'tests/runtest.sh')
| -rwxr-xr-x | tests/runtest.sh | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/tests/runtest.sh b/tests/runtest.sh index 1c072206d5..649e236b9d 100755 --- a/tests/runtest.sh +++ b/tests/runtest.sh @@ -339,9 +339,6 @@ function create_core_overlay { if [ ! -d "$coreClrBinDir" ]; then exit_with_error "$errorSource" "Directory specified by --coreClrBinDir does not exist: $coreClrBinDir" fi - if [ ! -f "$mscorlibDir/mscorlib.dll" ]; then - exit_with_error "$errorSource" "mscorlib.dll was not found in: $mscorlibDir" - fi if [ -z "$coreFxBinDir" ]; then exit_with_error "$errorSource" "One of --coreOverlayDir or --coreFxBinDir must be specified." "$printUsage" fi @@ -356,7 +353,6 @@ function create_core_overlay { 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 cp -f -v "$mscorlibDir/bin/"* "$coreOverlayDir/" 2>/dev/null fi @@ -389,20 +385,15 @@ function precompile_overlay_assemblies { echo Unable to generate dasm for $filename fi else - # Precompile any assembly except mscorlib since we already have its NI image available. - if [[ "$filename" != *"mscorlib.dll"* ]]; then - if [[ "$filename" != *"mscorlib.ni.dll"* ]]; then - echo Precompiling $filename - $overlayDir/crossgen /Platform_Assemblies_Paths $overlayDir $filename 2>/dev/null - local exitCode=$? - if [ $exitCode == -2146230517 ]; then - echo $filename is not a managed assembly. - elif [ $exitCode != 0 ]; then - echo Unable to precompile $filename. - else - echo Successfully precompiled $filename - fi - fi + echo Precompiling $filename + $overlayDir/crossgen /Platform_Assemblies_Paths $overlayDir $filename 2>/dev/null + local exitCode=$? + if [ $exitCode == -2146230517 ]; then + echo $filename is not a managed assembly. + elif [ $exitCode != 0 ]; then + echo Unable to precompile $filename. + else + echo Successfully precompiled $filename fi fi done |