From 0293ba8c7c4d41d17c814ff5457015d93533eeb5 Mon Sep 17 00:00:00 2001 From: Sean Gillespie Date: Tue, 12 Jan 2016 15:05:21 -0800 Subject: Remove volatile GC perf tests from the main run to provide more stable results. Also cause the GC perf framework to probe the current directory if the probe path is not set. --- tests/src/GC/Performance/Framework/PerfTests.cs | 72 ---------------------- .../src/GC/Performance/Framework/ProcessFactory.cs | 3 +- 2 files changed, 2 insertions(+), 73 deletions(-) (limited to 'tests/src/GC') 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() - { - [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() - { - [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() - { - [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() - { - [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); -- cgit v1.2.3