From 82c25b4e2e18308e6dec21c7e5ed26544a780851 Mon Sep 17 00:00:00 2001 From: Xavier Date: Tue, 2 Jul 2019 23:22:29 +0200 Subject: [PATCH] Don't use more test threads than make wants --- Makefile | 5 +++-- lemonldap-ng-portal/.proverc | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f8a6c0509..9c3dd94cb 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ DESTDIR= USEDEBIANLIBS=no PROD=$(USEDEBIANLIBS) USEEXTERNALLIBS=no +PARA=$(shell perl -000 -e 'print ( "$(MAKEFLAGS)" =~ /-j(\d+)/ ? "j$1:c" : "")') # Perl options #PERLOPTIONS="INSTALLDIRS=vendor" @@ -374,13 +375,13 @@ manager: manager_conf handler test: all common_test handler_test portal_test manager_test common_test: common - @HARNESS_OPTIONS=j8:c $(MAKE) -C ${SRCCOMMONDIR} test + @HARNESS_OPTIONS=$(PARA) $(MAKE) -C ${SRCCOMMONDIR} test handler_test: handler @$(MAKE) -C ${SRCHANDLERDIR} test portal_test: portal - @HARNESS_OPTIONS=j8:c $(MAKE) -C ${SRCPORTALDIR} test + @HARNESS_OPTIONS=$(PARA) $(MAKE) -C ${SRCPORTALDIR} test manager_test: manager @$(MAKE) -C ${SRCMANAGERDIR} test diff --git a/lemonldap-ng-portal/.proverc b/lemonldap-ng-portal/.proverc index 695d42cf0..c97cb726a 100644 --- a/lemonldap-ng-portal/.proverc +++ b/lemonldap-ng-portal/.proverc @@ -2,4 +2,3 @@ -I ../lemonldap-ng-common/blib/lib -I ../lemonldap-ng-handler/blib/lib --blib ---jobs 8