RVM-984: Don't run unit tests on the built RVM image by default

Running unit tests on the built RVM image leads to build failures for corner cases (e.g. builds with NoGC plan fail) and significantly increases the build time for slow configurations (e.g. prototype).

Author: erik-brangs

bin/buildit

@@ -90,6 +90,7 @@ Building Options:
      --build-arg      Specify an additional argument for the ant build
      --bc-arg         Specify arguments for the bootimage compiler
      --checkstyle     Perform source code style checks.
+     --test-image     Run unit tests on the built RVM image and fail the build if the tests fail
  -p, --profile        Perform a profiled build (including creation of a profile)	
      --comp-cache-dir Specify a cache location for component downloads
      --clear-cc       Clear out the component caches
@@ -145,6 +146,7 @@ GetOptions(
   "nuke" => \$nuke,
   "c|cross-to=s" => \$target,
   "checkstyle" => \$checkstyle,
+  "test-image" => \$test_image,
   "p|profile" => \$profile,
   "u|user=s" => \$cmd_user,
   "build-user=s" => \$cmd_hostUser,
@@ -438,13 +440,26 @@ if ($test_list ne "") {
 #
 # Configuration 
 #
+
+# Read out test-run properties that affect the build config (e.g. for checkstyle and
+# unit tests on the images) and add them to the build arguments.
+#
+# Those properties would be ignored otherwise because buildit always skips builds in test-runs.
 if ($test_set && !$checkstyle) {
   $checkstyle = `grep ^require.checkstyle=true\$ $localRoot/build/test-runs/$test_set.properties`;
   chomp($checkstyle);
   if ($checkstyle ne "") {
     $checkstyle = 1;
   }
 }
+if ($test_set && !$test_image) {
+  $test_image = `grep ^require.rvm-unit-tests=true\$ $localRoot/build/test-runs/$test_set.properties`;
+  chomp($test_image);
+  if ($test_image ne "") {
+    $test_image = 1;
+  }
+}
+
 $implicitconfigs = ($#gcs == -1 && $compiler eq "");
 if ($#gcs == -1 && $test_set && $compiler eq "") {
   my $rawconfigs = `grep \"^test.configs=.*$\" $localRoot/build/test-runs/$test_set.properties`;
@@ -653,7 +668,10 @@ if ($ok) {
     }
     if ($checkstyle ne "") {
       $defs .= "-Drequire.checkstyle=true ";
-    } 
+    }
+    if ($test_image ne "") {
+      $defs .= "-Drequire.rvm-unit-tests=true ";
+    }
     if ($x87 ne "") {
       $defs .= "-Dtarget.arch.sse2=none ";
     }

build.xml

@@ -1347,7 +1347,7 @@ Check to make sure all required properties are specified. This includes properti
     </junit>
   </target>
 
-  <target name="rvm-unit-tests" description="Run unit tests on Jikes RVM" depends="runtime">
+  <target name="rvm-unit-tests" description="Run unit tests on Jikes RVM" depends="runtime" if="${require.rvm-unit-tests}">
 
     <delete dir="${junit.reports.rvm}"/>
     <mkdir dir="${junit.reports.rvm}"/>

build/test-runs/pre-commit.properties

@@ -16,6 +16,7 @@
 #
 
 require.checkstyle=true
+require.rvm-unit-tests=true
 
 test.configs=prototype development development_Opt_1
 

test.xml

@@ -143,6 +143,7 @@
                    output="${driver.scratch.dir}/Build-${test.config.@{tag}.configuration}.txt">
               <property name="config.name" value="${test.config.@{tag}.configuration}"/>
               <property name="require.checkstyle" value="${require.checkstyle}"/>
+              <property name="require.rvm-unit-tests" value="${require.rvm-unit-tests}"/>
             </erant>
             <timer property="${test.config.@{tag}.configuration}.build.time" stop="true"/>
             <property name="${test.config.@{tag}.configuration}.built" value="true"/>