From 7f4ad09a94ceab16ff3c0b4e4455d19c890633e3 Mon Sep 17 00:00:00 2001 From: Kyungwoo Lee Date: Mon, 29 Feb 2016 08:18:33 -0800 Subject: [PATCH] ARM64: Fix for pow test This skips Pow(Double.Epsilon,1) test for ARM64 same as ARM. --- tests/arm64/Tests.lst | 2 +- tests/src/JIT/Directed/intrinsic/pow/pow1.cs | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/arm64/Tests.lst b/tests/arm64/Tests.lst index 009d907..822dbf0 100644 --- a/tests/arm64/Tests.lst +++ b/tests/arm64/Tests.lst @@ -2657,7 +2657,7 @@ WorkingDir=JIT\Directed\intrinsic\pow\pow1 MaxAllowedDurationSeconds=600 HostStyle=Any Expected=100 -Categories=JIT;EXPECTED_FAIL;NEED_TRIAGE +Categories=JIT;EXPECTED_PASS [_il_relbinop.exe_4069] RelativePath=JIT\Methodical\int64\misc\_il_relbinop\_il_relbinop.exe WorkingDir=JIT\Methodical\int64\misc\_il_relbinop diff --git a/tests/src/JIT/Directed/intrinsic/pow/pow1.cs b/tests/src/JIT/Directed/intrinsic/pow/pow1.cs index ee86af5..dc6e1a1 100644 --- a/tests/src/JIT/Directed/intrinsic/pow/pow1.cs +++ b/tests/src/JIT/Directed/intrinsic/pow/pow1.cs @@ -14,16 +14,18 @@ internal class pow1 double x, y, z; bool pass = true; - //Check if the test is being executed on ARM - bool isProcessorArm = false; + //Check if the test is being executed on ARMARCH + bool isProcessorArmArch = false; string processorArchEnvVar = null; processorArchEnvVar = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITECTURE"); - if ((processorArchEnvVar != null) && processorArchEnvVar.Equals("ARM", StringComparison.CurrentCultureIgnoreCase)) + if ((processorArchEnvVar != null) + && (processorArchEnvVar.Equals("ARM", StringComparison.CurrentCultureIgnoreCase) + || processorArchEnvVar.Equals("ARM64", StringComparison.CurrentCultureIgnoreCase))) { - isProcessorArm = true; + isProcessorArmArch = true; } x = 0; @@ -44,10 +46,10 @@ internal class pow1 pass = false; } - if (isProcessorArm) + if (isProcessorArmArch) { - //Skip this Test due to the way how Double.Epsilon is defined on ARM - Console.WriteLine("Skipping Pow(Double.Epsilon,1) test on ARM"); + //Skip this Test due to the way how Double.Epsilon is defined on ARMARCH + Console.WriteLine("Skipping Pow(Double.Epsilon,1) test on ARMARCH"); } else { -- 2.7.4