refactor

Author: marcoieni

src/ci/docker/host-x86_64/i686-gnu-2/Dockerfile

@@ -27,8 +27,7 @@ RUN echo "[rust]" > /config/nopt-std-config.toml
 RUN echo "optimize = false" >> /config/nopt-std-config.toml
 
 ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu --disable-optimize-tests
-ENV SCRIPT python3 ../x.py --stage 2 test \
-  # Skip tests that we run in i686-gnu-nopt-1
-  --skip compiler \
-  --skip library \
-  --skip tidyselftest
+ARG SCRIPT_ARG
+ENV DEFAULT_SCRIPT python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std \
+  && python3 ../x.py --stage 2 test
+ENV SCRIPT=${SCRIPT_ARG:-$DEFAULT_SCRIPT}

src/ci/docker/host-x86_64/i686-gnu-nopt-1/Dockerfile

@@ -24,14 +24,12 @@ COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
 ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu
-ENV SCRIPT python3 ../x.py --stage 2 test \
-  # Skip tests that we run in i686-gnu-2
-  --skip compiler \
-  --skip library \
-  --skip tidyselftest \
+ARG SCRIPT_ARG
+ENV DEFAULT_SCRIPT python3 ../x.py --stage 2 test \
   # Skip some tests that are unlikely to be platform specific, to speed up
   # this slow job.
   --skip src/bootstrap \
   --skip tests/rustdoc-js \
   --skip src/tools/error_index_generator \
   --skip src/tools/linkchecker
+ENV SCRIPT=${SCRIPT_ARG:-$DEFAULT_SCRIPT}

…r/host-x86_64/i686-gnu-nopt-2/Dockerfile …ker/host-x86_64/i686-gnu-nopt/Dockerfilesrc/ci/docker/host-x86_64/i686-gnu-nopt-2/Dockerfile renamed to src/ci/docker/host-x86_64/i686-gnu-nopt/Dockerfile src/ci/docker/host-x86_64/i686-gnu-nopt-2/Dockerfile renamed to src/ci/docker/host-x86_64/i686-gnu-nopt/Dockerfile

@@ -300,6 +300,14 @@ else
   command=(/checkout/src/ci/run.sh)
 fi
 
+# If the environment variable SCRIPT is defined,
+# set the build argument SCRIPT_ARG to SCRIPT.
+# In this way, we run the SCRIPT defined in CI,
+# instead of the one defined in the Dockerfile.
+if [ -n "${SCRIPT+x}" ]; then
+  args="$args --build-arg SCRIPT_ARG=$SCRIPT"
+fi
+
 if isCI; then
   # Get some needed information for $BASE_COMMIT
   #

…docker/host-x86_64/i686-gnu-1/Dockerfile …i/docker/host-x86_64/i686-gnu/Dockerfilesrc/ci/docker/host-x86_64/i686-gnu-1/Dockerfile renamed to src/ci/docker/host-x86_64/i686-gnu/Dockerfile src/ci/docker/host-x86_64/i686-gnu-1/Dockerfile renamed to src/ci/docker/host-x86_64/i686-gnu/Dockerfile

@@ -213,15 +213,61 @@ auto:
     <<: *job-linux-4c
 
   - image: i686-gnu-1
+    env:
+      IMAGE: i686-gnu
+      SCRIPT: >
+        python3 ../x.py --stage 2 test
+      # Skip tests that we run in i686-gnu-2
+        --skip compiler
+        --skip library
+        --skip tidyselftest
+      # Skip some tests that are unlikely to be platform specific, to speed up
+      # this slow job.
+        --skip src/bootstrap
+        --skip tests/rustdoc-js
+        --skip src/tools/error_index_generator
+        --skip src/tools/linkchecker
     <<: *job-linux-4c
 
   - image: i686-gnu-2
+    env:
+      IMAGE: i686-gnu
+      SCRIPT: >
+        python3 ../x.py --stage 2 test
+      # Skip tests that we run in i686-gnu-1
+        --skip tests
+        --skip src
+        --skip coverage-map
+        --skip coverage-run
+      # Skip some tests that are unlikely to be platform specific, to speed up
+      # this slow job.
+        --skip src/bootstrap
+        --skip tests/rustdoc-js
+        --skip src/tools/error_index_generator
+        --skip src/tools/linkchecker
     <<: *job-linux-4c
 
   - image: i686-gnu-nopt-1
+    env:
+      IMAGE: i686-gnu-nopt
+      SCRIPT: >
+        python3 ../x.py --stage 2 test
+      # Skip tests that we run in i686-gnu-nopt-1
+        --skip compiler
+        --skip library
+        --skip tidyselftest
     <<: *job-linux-4c
 
   - image: i686-gnu-nopt-2
+    env:
+      IMAGE: i686-gnu-nopt
+      SCRIPT: >
+        python3 ../x.py --stage 2 test
+      # Skip tests that we run in i686-gnu-nopt-1
+        --skip tests
+        --skip src
+        --skip coverage-map
+        --skip coverage-run
     <<: *job-linux-4c
 
   - image: mingw-check