enable in-tree std on some runners

Signed-off-by: onur-ozkan <[email protected]>

Author: onur-ozkan

src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile

@@ -70,6 +70,8 @@ RUN sh /scripts/sccache.sh
 # Fix rustc_codegen_gcc lto issues.
 ENV GCC_EXEC_PREFIX="/usr/lib/gcc/"
 
+ENV USE_IN_TREE_LIBTEST_ON_COMPILETEST 1
+
 COPY host-x86_64/x86_64-gnu-tools/checktools.sh /tmp/
 
 COPY scripts/nodejs.sh /scripts/

src/ci/run.sh

@@ -134,6 +134,7 @@ if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then
 
   CODEGEN_BACKENDS="${CODEGEN_BACKENDS:-llvm}"
   RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=$CODEGEN_BACKENDS"
+  RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.compiletest-use-stage0-libtest=false"
 else
   # We almost always want debug assertions enabled, but sometimes this takes too
   # long for too little benefit, so we just turn them off.
@@ -186,6 +187,10 @@ else
   if [ "$NO_DOWNLOAD_CI_RUSTC" = "" ]; then
     RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.download-rustc=if-unchanged"
   fi
+
+  if [ "$USE_IN_TREE_LIBTEST_ON_COMPILETEST" = "1" ]; then
+    RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.compiletest-use-stage0-libtest=false"
+  fi
 fi
 
 if [ "$ENABLE_GCC_CODEGEN" = "1" ]; then