[MERGE chakra-core#4761 @sigatrev] exclude require_asmjs and require_wasm tags for arm and arm64

sigatrev · sigatrev · commit 86c3d097852d · 2018-02-28T14:57:43.000-08:00
Merge pull request chakra-core#4761 from sigatrev:require
diff --git a/test/Bugs/rlexe.xml b/test/Bugs/rlexe.xml
@@ -213,7 +213,7 @@
   <test>
     <default>
       <files>fabs1.js</files>
-      <tags>exclude_dynapogo,require_backend,exclude_arm,exclude_arm64</tags>
+      <tags>exclude_dynapogo,require_backend,require_asmjs</tags>
       <compile-flags>-off:backend -asmjs -testtrace:asmjs</compile-flags>
       <baseline>fabs1.baseline</baseline>
     </default>
diff --git a/test/rlexedirs.xml b/test/rlexedirs.xml
@@ -276,37 +276,37 @@
 <dir>
   <default>
     <files>AsmJs</files>
-    <tags>exclude_serialized,exclude_arm,exclude_arm64,require_backend,require_asmjs</tags>
+    <tags>exclude_serialized,require_backend,require_asmjs</tags>
   </default>
 </dir>
 <dir>
   <default>
     <files>AsmJsFloat</files>
-    <tags>exclude_serialized,exclude_arm,exclude_arm64,require_backend,require_asmjs</tags>
+    <tags>exclude_serialized,require_backend,require_asmjs</tags>
   </default>
 </dir>
 <dir>
   <default>
     <files>AsmJsParser</files>
-    <tags>exclude_serialized,exclude_arm,exclude_arm64,require_backend,require_asmjs</tags>
+    <tags>exclude_serialized,require_backend,require_asmjs</tags>
   </default>
 </dir>
 <dir>
   <default>
     <files>WasmSpec</files>
-    <tags>exclude_serialized,exclude_arm,exclude_arm64,require_backend,exclude_jshost,exclude_win7,require_wasm</tags>
+    <tags>exclude_serialized,require_backend,exclude_jshost,exclude_win7,require_wasm</tags>
   </default>
 </dir>
 <dir>
   <default>
     <files>WasmSpec.MultiValue</files>
-    <tags>exclude_serialized,exclude_arm,exclude_arm64,require_backend,require_wasm</tags>
+    <tags>exclude_serialized,require_backend,require_wasm</tags>
   </default>
 </dir>
 <dir>
   <default>
     <files>wasm</files>
-    <tags>exclude_serialized,exclude_arm,exclude_arm64,require_backend,require_wasm</tags>
+    <tags>exclude_serialized,require_backend,require_wasm</tags>
   </default>
 </dir>
 <dir>
@@ -341,7 +341,7 @@
 <dir>
   <default>
     <files>wasm.simd</files>
-    <tags>require_wasm,exclude_serialized,exclude_arm,exclude_arm64,require_backend,exclude_xplat</tags>
+    <tags>require_wasm,exclude_serialized,require_backend,exclude_xplat</tags>
   </default>
 </dir>
 </regress-exe>
diff --git a/test/runtests.cmd b/test/runtests.cmd
@@ -350,6 +350,9 @@ goto :main
   if "%_BuildTypeMapped%" == "test" set _BuildTypeMapped=fre
   if "%_BuildTypeMapped%" == "codecoverage" set _BuildTypeMapped=fre
 
+  if "%_BuildArch%" == "arm"    set _NOTTAGS=%_NOTTAGS% -nottags:require_asmjs -nottags:require_wasm
+  if "%_BuildArch%" == "arm64"  set _NOTTAGS=%_NOTTAGS% -nottags:require_asmjs -nottags:require_wasm
+
   if "%Disable_JIT%" == "1" (
       set _dynamicprofilecache=
       set _dynamicprofileinput=
