summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Gillespie <sean.william.g@gmail.com>2016-07-19 22:46:46 -0700
committerGitHub <noreply@github.com>2016-07-19 22:46:46 -0700
commit05f8883d1fb005d50e2b247f27faca102d6eafcf (patch)
tree80ba7f1586083e3fc3a2ee788d96dcb48bf10d08
parent7bbf4b208506a572374a57cf53f7bfb098483f86 (diff)
parentd82f1b92e0b49b2eff69b7f06117115a3715105e (diff)
downloadcoreclr-05f8883d1fb005d50e2b247f27faca102d6eafcf.tar.gz
coreclr-05f8883d1fb005d50e2b247f27faca102d6eafcf.tar.bz2
coreclr-05f8883d1fb005d50e2b247f27faca102d6eafcf.zip
Merge pull request #6338 from swgillespie/revert-weakreference-tests
Re-enable two tests testing GC.GetGeneration(System.WeakReference)
-rw-r--r--tests/issues.targets8
-rw-r--r--tests/testsFailingOutsideWindows.txt4
-rw-r--r--tests/x86_jit32_issues.targets10
-rw-r--r--tests/x86_legacy_backend_issues.targets8
4 files changed, 1 insertions, 29 deletions
diff --git a/tests/issues.targets b/tests/issues.targets
index c67941e2c5..ebb4e590da 100644
--- a/tests/issues.targets
+++ b/tests/issues.targets
@@ -543,13 +543,5 @@
<ExcludeList Include="$(XunitTestBinBase)\JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd">
<Issue>needs triage</Issue>
</ExcludeList>
-
- <!-- GC.GetGeneration on weak references -->
- <ExcludeList Include="$(XunitTestBinBase)\GC\API\GC\GetGenerationWR\GetGenerationWR.cmd">
- <Issue>5514</Issue>
- </ExcludeList>
- <ExcludeList Include="$(XunitTestBinBase)\GC\API\GC\GetGenerationWR2\GetGenerationWR2.cmd">
- <Issue>5514</Issue>
- </ExcludeList>
</ItemGroup>
</Project>
diff --git a/tests/testsFailingOutsideWindows.txt b/tests/testsFailingOutsideWindows.txt
index 0d7f09d5e7..b301a8b61f 100644
--- a/tests/testsFailingOutsideWindows.txt
+++ b/tests/testsFailingOutsideWindows.txt
@@ -70,6 +70,4 @@ GC/Features/BackgroundGC/foregroundgc/foregroundgc.sh
GC/Features/LOHFragmentation/lohfragmentation/lohfragmentation.sh
GC/Features/SustainedLowLatency/scenario/scenario.sh
GC/Regressions/dev10bugs/536168/536168/536168.sh
-GC/Stress/Framework/ReliabilityFramework/ReliabilityFramework.sh
-GC/API/GC/GetGenerationWR/GetGenerationWR.sh
-GC/API/GC/GetGenerationWR2/GetGenerationWR2.sh \ No newline at end of file
+GC/Stress/Framework/ReliabilityFramework/ReliabilityFramework.sh \ No newline at end of file
diff --git a/tests/x86_jit32_issues.targets b/tests/x86_jit32_issues.targets
index 03a859de9d..097d8034ba 100644
--- a/tests/x86_jit32_issues.targets
+++ b/tests/x86_jit32_issues.targets
@@ -276,16 +276,6 @@
</ExcludeList>
</ItemGroup>
- <!-- GC.GetGeneration on weak references -->
- <ItemGroup>
- <ExcludeList Include="$(XunitTestBinBase)\GC\API\GC\GetGenerationWR\GetGenerationWR.cmd">
- <Issue>5514</Issue>
- </ExcludeList>
- <ExcludeList Include="$(XunitTestBinBase)\GC\API\GC\GetGenerationWR2\GetGenerationWR2.cmd">
- <Issue>5514</Issue>
- </ExcludeList>
- </ItemGroup>
-
<!-- Tests that need to be triaged for vararg usage as that is not supported -->
<ItemGroup Condition="'$(XunitTestBinBase)' != ''">
<ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\PREFIX\unaligned\1\arglist\arglist.cmd">
diff --git a/tests/x86_legacy_backend_issues.targets b/tests/x86_legacy_backend_issues.targets
index 22b0638690..46cae374eb 100644
--- a/tests/x86_legacy_backend_issues.targets
+++ b/tests/x86_legacy_backend_issues.targets
@@ -370,14 +370,6 @@
<ExcludeList Include="$(XunitTestBinBase)\baseservices\threading\waithandle\waitall\waitallex8a\*">
<Issue>3832</Issue>
</ExcludeList>
-
- <!-- GC.GetGeneration on weak references -->
- <ExcludeList Include="$(XunitTestBinBase)\GC\API\GC\GetGenerationWR\GetGenerationWR.cmd">
- <Issue>5514</Issue>
- </ExcludeList>
- <ExcludeList Include="$(XunitTestBinBase)\GC\API\GC\GetGenerationWR2\GetGenerationWR2.cmd">
- <Issue>5514</Issue>
- </ExcludeList>
</ItemGroup>
<!-- Tests that need to be triaged for vararg usage as that is not supported -->