From 9a2e045226afe90d1c66d3d5674921113fbaf93b Mon Sep 17 00:00:00 2001
From: Adam Sitnik <adam.sitnik@gmail.com>
Date: Wed, 22 Jan 2020 18:43:45 +0100
Subject: [PATCH] Fix microbenchmarks input files (#1142)

---
 .gitattributes                                  | 17 ++++++++---------
 .../System.IO.Compression/CompressedFile.cs     |  2 +-
 .../Configuration.Certificates.cs               |  2 +-
 .../BenchmarksGame/Inputs/InputFileHelper.cs    |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index b3df3de93..b300ef89d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,12 +2,11 @@
 *.md text working-tree-encoding=utf-8 git-encoding=utf-8 eol=lf
 *.sh text eol=lf
 
-src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/knucleotide-input-big.txt text eol=lf
-src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/knucleotide-input.txt text eol=lf
-src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/regexdna-input25.txt text eol=lf
-src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/regexdna-input25000.txt text eol=lf
-src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/revcomp-input25.txt text eol=lf
-src/benchmarks/micro/coreclr/BenchmarksGame/Inputs/revcomp-input25000.txt text eol=lf
-src/benchmarks/micro/corefx/System.IO.Compression/TestData/sum text eol=lf
-src/benchmarks/micro/corefx/System.IO.Compression/TestData/alice29.txt text eol=lf
-src/benchmarks/micro/corefx/System.Text.RegularExpressions/content/200_000.in text eol=lf
+src/benchmarks/micro/runtime/BenchmarksGame/Inputs/knucleotide-input-big.txt text eol=lf
+src/benchmarks/micro/runtime/BenchmarksGame/Inputs/knucleotide-input.txt text eol=lf
+src/benchmarks/micro/runtime/BenchmarksGame/Inputs/regexdna-input25.txt text eol=lf
+src/benchmarks/micro/runtime/BenchmarksGame/Inputs/regexdna-input25000.txt text eol=lf
+src/benchmarks/micro/runtime/BenchmarksGame/Inputs/revcomp-input25.txt text eol=lf
+src/benchmarks/micro/runtime/BenchmarksGame/Inputs/revcomp-input25000.txt text eol=lf
+src/benchmarks/micro/libraries/System.IO.Compression/TestData/sum text eol=lf
+src/benchmarks/micro/libraries/System.IO.Compression/TestData/alice29.txt text eol=lf
diff --git a/src/benchmarks/micro/libraries/System.IO.Compression/CompressedFile.cs b/src/benchmarks/micro/libraries/System.IO.Compression/CompressedFile.cs
index b6e13c90b..e9a146395 100644
--- a/src/benchmarks/micro/libraries/System.IO.Compression/CompressedFile.cs
+++ b/src/benchmarks/micro/libraries/System.IO.Compression/CompressedFile.cs
@@ -35,7 +35,7 @@ namespace System.IO.Compression
         internal static string GetFilePath(string fileName) 
             => Path.Combine(
                 Path.GetDirectoryName(typeof(CompressedFile).Assembly.Location), 
-                "corefx", "System.IO.Compression", "TestData",
+                "libraries", "System.IO.Compression", "TestData",
                 fileName);
     }
 }
\ No newline at end of file
diff --git a/src/benchmarks/micro/libraries/System.Net.Http/Configuration.Certificates.cs b/src/benchmarks/micro/libraries/System.Net.Http/Configuration.Certificates.cs
index cf91ac552..44390ba37 100644
--- a/src/benchmarks/micro/libraries/System.Net.Http/Configuration.Certificates.cs
+++ b/src/benchmarks/micro/libraries/System.Net.Http/Configuration.Certificates.cs
@@ -19,7 +19,7 @@ namespace System.Net.Test.Common
 
             private static X509Certificate2 GetCertificate(string certificateFileName) 
                 => new X509Certificate2(
-                    File.ReadAllBytes(Path.Combine("corefx", "System.Net.Http", certificateFileName)),
+                    File.ReadAllBytes(Path.Combine("libraries", "System.Net.Http", certificateFileName)),
                     CertificatePassword,
                     X509KeyStorageFlags.DefaultKeySet);
         }
diff --git a/src/benchmarks/micro/runtime/BenchmarksGame/Inputs/InputFileHelper.cs b/src/benchmarks/micro/runtime/BenchmarksGame/Inputs/InputFileHelper.cs
index 26dd744d3..67ff91de9 100644
--- a/src/benchmarks/micro/runtime/BenchmarksGame/Inputs/InputFileHelper.cs
+++ b/src/benchmarks/micro/runtime/BenchmarksGame/Inputs/InputFileHelper.cs
@@ -20,6 +20,6 @@ namespace BenchmarksGame
         internal static int GetFileLength(string filePath) => (int) new FileInfo(filePath).Length;
 
         private static string GetFullPath(string fileName)
-            => Path.Combine(Path.GetDirectoryName(typeof(InputFileHelper).Assembly.Location), "coreclr", "BenchmarksGame", "Inputs", fileName);
+            => Path.Combine(Path.GetDirectoryName(typeof(InputFileHelper).Assembly.Location), "runtime", "BenchmarksGame", "Inputs", fileName);
     }
 }
\ No newline at end of file