Fix microbenchmarks input files (dotnet#1142)

adamsitnik · web-flow · commit 9a2e045226af · 2020-01-22T18:43:45.000+01:00
diff --git 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
@@ -35,7 +35,7 @@ public CompressedFile(string fileName, CompressionLevel compressionLevel, Func<S
         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);
     }
 }
diff --git 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 @@ public static class Certificates
 
             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
@@ -20,6 +20,6 @@ internal static string FindInputFile(string inputFile)
         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);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public CompressedFile(string fileName, CompressionLevel compressionLevel, Func<S`
`35`	`35`	`internal static string GetFilePath(string fileName)`
`36`	`36`	`=> Path.Combine(`
`37`	`37`	`Path.GetDirectoryName(typeof(CompressedFile).Assembly.Location),`
`38`		`- "corefx", "System.IO.Compression", "TestData",`
	`38`	`+ "libraries", "System.IO.Compression", "TestData",`
`39`	`39`	`fileName);`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public static class Certificates`
`19`	`19`
`20`	`20`	`private static X509Certificate2 GetCertificate(string certificateFileName)`
`21`	`21`	`=> new X509Certificate2(`
`22`		`- File.ReadAllBytes(Path.Combine("corefx", "System.Net.Http", certificateFileName)),`
	`22`	`+ File.ReadAllBytes(Path.Combine("libraries", "System.Net.Http", certificateFileName)),`
`23`	`23`	`CertificatePassword,`
`24`	`24`	`X509KeyStorageFlags.DefaultKeySet);`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ internal static string FindInputFile(string inputFile)`
`20`	`20`	`internal static int GetFileLength(string filePath) => (int) new FileInfo(filePath).Length;`
`21`	`21`
`22`	`22`	`private static string GetFullPath(string fileName)`
`23`		`- => Path.Combine(Path.GetDirectoryName(typeof(InputFileHelper).Assembly.Location), "coreclr", "BenchmarksGame", "Inputs", fileName);`
	`23`	`+ => Path.Combine(Path.GetDirectoryName(typeof(InputFileHelper).Assembly.Location), "runtime", "BenchmarksGame", "Inputs", fileName);`
`24`	`24`	`}`
`25`	`25`	`}`