Clean build results to make sure nothing refers to them while testing

(cherry picked from commit a162979)

Author: eregon

ci.jsonnet

@@ -76,7 +76,7 @@ local part_definitions = {
       environment+: { path+:: ["$MAVEN_HOME/bin"] },
     },
 
-    build: {
+    build_no_clean: {
       setup+: [["mx", "sversions"]] +
               # aot-build.log is used for the build-stats metrics, in other cases it does no harm
               jt(["build", "--env", self.mx_env] + self.jt_build_options + ["--"] + self.mx_build_options + ["|", "tee", "aot-build.log"]) +
@@ -86,6 +86,11 @@ local part_definitions = {
               ],
     },
 
+    build: $.use.build_no_clean + {
+      # Clean build results to make sure nothing refers to them while testing
+      setup+: jt(["mx", "--env", self.mx_env, "clean"]),
+    },
+
     clone_enterprise: {
       setup+: [["mx", "sversions"]] + jt(["checkout_enterprise_revision"]),
     },
@@ -273,18 +278,19 @@ local part_definitions = {
 
   run: {
     test_unit_tck_specs: {
-      run+: jt(["test", "unit"]) +
-            jt(["test", "tck"]) +
-            jt(["test", "specs"]) +
-            jt(["test", "specs", ":next"]),
+      run+: jt(["test", "specs"]) +
+            jt(["test", "specs", ":next"]) +
+            jt(["build"]) + # We need mx distributions to run unit tests
+            jt(["test", "unit"]) +
+            jt(["test", "tck"]),
     },
 
     test_fast: {
       run+: jt(["test", "fast"]),
     },
 
     lint: {
-      is_after:: ["$.use.build"],
+      is_after:: ["$.use.build_no_clean"],
       downloads+: {
         JDT: { name: "ecj", version: "4.5.1", platformspecific: false },
         ECLIPSE: { version: "4.5.2", name: "eclipse", platformspecific: true },
@@ -427,7 +433,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
 
   test_builds:
     {
-      "ruby-lint": $.platform.linux + $.cap.gate + $.jdk.v8 + $.use.common + $.env.jvm + $.use.build + $.run.lint + { timelimit: "30:00" },
+      "ruby-lint": $.platform.linux + $.cap.gate + $.jdk.v8 + $.use.common + $.env.jvm + $.use.build_no_clean + $.run.lint + { timelimit: "30:00" },
     } +
 
     {

tool/make-standalone-distribution.sh

@@ -12,7 +12,14 @@ set -x
 # Build
 tool/jt.rb build --env native
 
-release_home=$(tool/jt.rb mx --env native standalone-home ruby)
+standalone=$(tool/jt.rb mx --env native standalone-home ruby)
+release_home="$PWD/mxbuild/truffleruby-standalone"
+rm -rf "$release_home"
+cp -R "$standalone" "$release_home"
+# Clean build results to make sure nothing refers to them while testing
+tool/jt.rb mx --env native clean
+rm -rf ../graal/sdk/mxbuild
+rm -rf bin lib src
 
 # Test the post-install hook
 TRUFFLERUBY_RECOMPILE_OPENSSL=true "$release_home/lib/truffle/post_install_hook.sh"