add testing for medium and large bytecode layout to nightly config

MikeHolman · MikeHolman · commit fe26fe72ec60 · 2016-07-18T15:50:46.000-07:00
diff --git a/Build/Chakra.Build.props b/Build/Chakra.Build.props
@@ -24,6 +24,10 @@
         %(PreprocessorDefinitions);
         DISABLE_JIT=1
       </PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(ENABLE_CODECOVERAGE)'=='true'">
+        %(PreprocessorDefinitions);
+        BYTECODE_TESTING=1
+      </PreprocessorDefinitions>
       <!-- REVIEW: These are warning are introduced when moving to VS2015 tools, may want to clean these up -->
       <DisableSpecificWarnings>
         %(DisableSpecificWarnings);
diff --git a/test/Function/rlexe.xml b/test/Function/rlexe.xml
@@ -325,7 +325,7 @@
       <files>FuncBody.bug231397.js</files>
       <baseline>FuncBody.bug231397.baseline</baseline>
       <compile-flags>-dump:bytecode</compile-flags>
-      <tags>exclude_fre,require_backend</tags>
+      <tags>exclude_bytecodelayout,exclude_fre,require_backend</tags>
     </default>
   </test>
   <test>
diff --git a/test/runtests.cmd b/test/runtests.cmd
@@ -163,7 +163,6 @@ goto :main
   if /i "%1" == "-quiet"            set _quiet=-quiet&                                          goto :ArgOk
   :: TODO Consider removing -drt and exclude_drt in some reasonable manner
   if /i "%1" == "-drt"              set _drt=1& set _NOTTAGS=%_NOTTAGS% -nottags:exclude_drt&   goto :ArgOk
-  if /i "%1" == "-nightly"          set _nightly=1&                                             goto :ArgOk
   if /i "%1" == "-rebase"           set _rebase=-rebase&                                        goto :ArgOk
   if /i "%1" == "-rundebug"         set _RUNDEBUG=1&                                            goto :ArgOk
   :: TODO Figure out best way to specify build arch for tests that are excluded to specific archs
@@ -212,6 +211,16 @@ goto :main
     set _Variants=disable_jit
     goto :ArgOk
   )
+  
+  if /i "%1" == "-nightly" (
+    set _nightly=1
+    if "%_ExtraVariants%" == "" (
+      set _ExtraVariants=mediumlayout,largelayout,forceserialized
+    ) else (
+      set _ExtraVariants=%_ExtraVariants%,mediumlayout,largelayout,forceserialized
+    )
+    goto :ArgOk
+  )
 
   if not "%1" == "" echo Unknown argument: %1 & set fShowGetHelp=1
 
@@ -344,6 +353,24 @@ goto :main
 :: ============================================================================
 :RunOneVariant
 
+  if "%_BuildType%" == "test" (
+    rem bytecode layout switches not available in test build
+    if "%_TESTCONFIG%"=="largelayout" (
+      if not exist %_logsRoot%\%_BuildArch%_%_BuildType%\%_TESTCONFIG% (
+        mkdir %_logsRoot%\%_BuildArch%_%_BuildType%\%_TESTCONFIG%
+      )
+      echo. > %_logsRoot%\%_BuildArch%_%_BuildType%\%_TESTCONFIG%\rl.log
+      goto :eof
+    )
+    if "%_TESTCONFIG%"=="mediumlayout" (
+      if not exist %_logsRoot%\%_BuildArch%_%_BuildType%\%_TESTCONFIG% (
+        mkdir %_logsRoot%\%_BuildArch%_%_BuildType%\%_TESTCONFIG%
+      )
+      echo. > %_logsRoot%\%_BuildArch%_%_BuildType%\%_TESTCONFIG%\rl.log
+      goto :eof
+    )
+  )
+
   set _OLD_CC_FLAGS=%EXTRA_CC_FLAGS%
   set EXTRA_RL_FLAGS=-appendtestnametoextraccflags
   set _exclude_serialized=
@@ -407,6 +434,16 @@ goto :main
     set EXTRA_RL_FLAGS=
     set _exclude_serialized=-nottags:exclude_serialized
   )
+  if "%_TESTCONFIG%"=="mediumlayout" (
+    set EXTRA_CC_FLAGS=%EXTRA_CC_FLAGS% -MediumByteCodeLayout -forceserialized
+    set EXTRA_RL_FLAGS=-nottags:exclude_bytecodelayout
+    set _exclude_serialized=-nottags:exclude_serialized
+  )
+  if "%_TESTCONFIG%"=="largelayout" (
+    set EXTRA_CC_FLAGS=%EXTRA_CC_FLAGS% -LargeByteCodeLayout -forceserialized
+    set EXTRA_RL_FLAGS=-nottags:exclude_bytecodelayout
+    set _exclude_serialized=-nottags:exclude_serialized
+  )
 
   echo.
   echo ############# Starting %_TESTCONFIG% variant #############
