summaryrefslogtreecommitdiff
path: root/tests/src/GC/Performance
diff options
context:
space:
mode:
authorSean Gillespie <sean.william.g@gmail.com>2016-01-12 21:46:06 -0800
committerSean Gillespie <sean.william.g@gmail.com>2016-01-12 21:46:06 -0800
commita31dbef16b121d388068f19c73516a611b65cfe8 (patch)
tree0eca4e83e22d596046d80cf65083dfb3fcb43c5d /tests/src/GC/Performance
parent041281c985cfa7d4cdff405373bba6bce8df27d8 (diff)
parent0293ba8c7c4d41d17c814ff5457015d93533eeb5 (diff)
downloadcoreclr-a31dbef16b121d388068f19c73516a611b65cfe8.tar.gz
coreclr-a31dbef16b121d388068f19c73516a611b65cfe8.tar.bz2
coreclr-a31dbef16b121d388068f19c73516a611b65cfe8.zip
Merge pull request #2625 from swgillespie/volatile_gc_perf_tests
Remove volatile GC perf tests from the main perf run
Diffstat (limited to 'tests/src/GC/Performance')
-rw-r--r--tests/src/GC/Performance/Framework/PerfTests.cs72
-rw-r--r--tests/src/GC/Performance/Framework/ProcessFactory.cs3
2 files changed, 2 insertions, 73 deletions
diff --git a/tests/src/GC/Performance/Framework/PerfTests.cs b/tests/src/GC/Performance/Framework/PerfTests.cs
index 8149d11e57..40bd91b524 100644
--- a/tests/src/GC/Performance/Framework/PerfTests.cs
+++ b/tests/src/GC/Performance/Framework/PerfTests.cs
@@ -264,77 +264,5 @@ namespace GCPerfTestFramework
}
}
}
-
- [Benchmark]
- public void Allocation_Server()
- {
- var exe = ProcessFactory.ProbeForFile("Allocation.exe");
- var env = new Dictionary<string, string>()
- {
- [ServerGC] = "1",
- [ConcurrentGC] = "1"
- };
- foreach (var iteration in Benchmark.Iterations)
- {
- using (iteration.StartMeasurement())
- {
- ProcessFactory.LaunchProcess(exe, "5000000000 95000", env);
- }
- }
- }
-
- [Benchmark]
- public void Allocation_Server_NonConcurrent()
- {
- var exe = ProcessFactory.ProbeForFile("Allocation.exe");
- var env = new Dictionary<string, string>()
- {
- [ServerGC] = "1",
- [ConcurrentGC] = "0"
- };
- foreach (var iteration in Benchmark.Iterations)
- {
- using (iteration.StartMeasurement())
- {
- ProcessFactory.LaunchProcess(exe, "5000000000 95000", env);
- }
- }
- }
-
-
- [Benchmark]
- public void EE_GC_Server()
- {
- var exe = ProcessFactory.ProbeForFile("EEGC.exe");
- var env = new Dictionary<string, string>()
- {
- [ServerGC] = "1"
- };
- foreach (var iteration in Benchmark.Iterations)
- {
- using (iteration.StartMeasurement())
- {
- ProcessFactory.LaunchProcess(exe, environmentVariables: env);
- }
- }
- }
-
- [Benchmark]
- public void EE_GC_Workstation()
- {
- var exe = ProcessFactory.ProbeForFile("EEGC.exe");
- var env = new Dictionary<string, string>()
- {
- [ServerGC] = "0"
- };
- foreach (var iteration in Benchmark.Iterations)
- {
- using (iteration.StartMeasurement())
- {
- ProcessFactory.LaunchProcess(exe, environmentVariables: env);
- }
- }
- }
-
}
}
diff --git a/tests/src/GC/Performance/Framework/ProcessFactory.cs b/tests/src/GC/Performance/Framework/ProcessFactory.cs
index e8fca96583..f4708e7062 100644
--- a/tests/src/GC/Performance/Framework/ProcessFactory.cs
+++ b/tests/src/GC/Performance/Framework/ProcessFactory.cs
@@ -213,7 +213,8 @@ namespace GCPerfTestFramework
var probePath = Environment.GetEnvironmentVariable(ProbePathEnvironmentVariable);
if (probePath == null)
{
- throw new InvalidOperationException($"Environment variable {ProbePathEnvironmentVariable} must be set!");
+ // fall back to the current working directory if the probe path is not set
+ probePath = Directory.GetCurrentDirectory();
}
var path = ProbeForFileImpl(fileName, probePath);