Run make in 3 steps with time

Signed-off-by: Stefan Weil <[email protected]>
stweil · Sep 9, 2024 · 0e6e0b8 · 0e6e0b8
1 parent e6931b0
commit 0e6e0b8
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild-template.yml
@@ -24,9 +24,10 @@
           i386-softmmu microblaze-softmmu mips-softmmu mipsel-softmmu
           mips64-softmmu ppc-softmmu riscv32-softmmu sh4-softmmu
           sparc-softmmu xtensa-softmmu $CROSS_SKIP_TARGETS"
-    - time make -j$(expr $(nproc) + 0) all $MAKE_CHECK_ARGS
-    - time make -j$(expr $(nproc) + 0) check-build $MAKE_CHECK_ARGS
-    - time make -j1 check-build $MAKE_CHECK_ARGS
+    - time make -j$(expr $(nproc) + 0) all
+    - time make -j$(expr $(nproc) + 0) check-build
+    - time make -j$(expr $(nproc) + 0) $MAKE_CHECK_ARGS
+    - time make -j1 $MAKE_CHECK_ARGS
     - if grep -q "EXESUF=.exe" config-host.mak;
       then make installer;
       version="$(git describe --match v[0-9]* 2>/dev/null || git rev-parse --short HEAD)";
@@ -57,9 +58,10 @@
     - cd build
     - ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
         --disable-tools --enable-${ACCEL:-kvm} $EXTRA_CONFIGURE_OPTS
-    - time make -j$(expr $(nproc) + 0) all $MAKE_CHECK_ARGS
-    - time make -j$(expr $(nproc) + 0) check-build $MAKE_CHECK_ARGS
-    - time make -j1 check-build $MAKE_CHECK_ARGS
+    - time make -j$(expr $(nproc) + 0) all
+    - time make -j$(expr $(nproc) + 0) check-build
+    - time make -j$(expr $(nproc) + 0) $MAKE_CHECK_ARGS
+    - time make -j1 $MAKE_CHECK_ARGS
 
 .cross_user_build_job:
   extends: .base_job_template
@@ -80,9 +82,10 @@
           alpha-linux-user cris-linux-user m68k-linux-user microblazeel-linux-user
           or1k-linux-user ppc-linux-user sparc-linux-user
           xtensa-linux-user $CROSS_SKIP_TARGETS"
-    - time make -j$(expr $(nproc) + 0) all $MAKE_CHECK_ARGS
-    - time make -j$(expr $(nproc) + 0) check-build $MAKE_CHECK_ARGS
-    - time make -j1 check-build $MAKE_CHECK_ARGS
+    - time make -j$(expr $(nproc) + 0) all
+    - time make -j$(expr $(nproc) + 0) check-build
+    - time make -j$(expr $(nproc) + 0) $MAKE_CHECK_ARGS
+    - time make -j1 $MAKE_CHECK_ARGS
 
 # We can still run some tests on some of our cross build jobs. They can add this
 # template to their extends to save the build logs and test results