Changeset 103467 in vbox

Timestamp:

Feb 20, 2024 6:47:25 AM (9 months ago)

Author:

vboxsync

Message:

Makefile.kmk: Get rid of the second parfait run, bugref:3409

File:

• trunk/Makefile.kmk (modified) (2 diffs)

trunk/Makefile.kmk

@@ -2521 +2521 @@
         - $(REDIRECT) -E "PARFAIT_DUMP_PATH=$(PATH_OUT)" -- $(TIME) -- $(VBOX_PARFAIT) \
          $(if-expr defined(VBOX_PARFAIT_SERVER),-s $(VBOX_PARFAIT_SERVER),) \
+         $(VBOX_PARFAIT_OPTS) \
          $(if-expr defined(VBOX_PARFAIT_SERVER_BASELINE),-b $(VBOX_PARFAIT_SERVER_BASELINE),) \
-         -j $(if-expr $(KMK_OPTS_JOBS) > 0,$(expr $(KMK_OPTS_JOBS) / 2),$(NUMBER_OF_PROCESSORS)) \
+         -j $(if-expr $(KMK_OPTS_JOBS) > 0, $(KMK_OPTS_JOBS), 1) \
          -o $(PATH_OUT)/report.txt \
          -g $(PATH_OUT)/html \
@@ -2530 +2531 @@
          -r $(VBOX_SVN_REV) \
          $(PATH_OUT)/obj
- ifdef VBOX_PARFAIT_SERVER_2
-        - $(REDIRECT) -E "PARFAIT_DUMP_PATH=$(PATH_OUT)" -- $(TIME) -- $(VBOX_PARFAIT) \
-         $(if-expr defined(VBOX_PARFAIT_SERVER_2),-s $(VBOX_PARFAIT_SERVER_2),) \
-         $(VBOX_PARFAIT_OPTS_2) \
-         $(if-expr defined(VBOX_PARFAIT_SERVER_BASELINE_2),-b $(VBOX_PARFAIT_SERVER_BASELINE_2),) \
-         -j $(if-expr $(KMK_OPTS_JOBS) > 0,$(expr $(KMK_OPTS_JOBS) / 2),$(NUMBER_OF_PROCESSORS)) \
-         -o $(PATH_OUT)/report_2.txt \
-         -g $(PATH_OUT)/html_2 \
-         -c $(PATH_ROOT)/tools/parfait-vbox.conf \
-         --exclude-from=$(PATH_ROOT)/tools/parfait-vbox-exclude.conf \
-         -z $(PATH_ROOT) \
-         -r $(VBOX_SVN_REV) \
-         $(PATH_OUT)/obj
- endif
 else
         $(ECHO) This target requires VBOX_WITH_PARFAIT to be set.