Converse, Util Tests: Add a testp target for scalable testing on P pes (

#2958)

* Converse, Util Tests: Add a testp target

This patch also adds a high level testp makefile
target in the tests folder.

* Add removed input argument passed to check

* Minor fix (remove extra character and a newline)

tests/Makefile

@@ -19,6 +19,8 @@ all: $(foreach i,$(DIRS),build-$i)
 
 test: $(foreach i,$(TESTDIRS),test-$i)
 
+testp: $(foreach i,$(TESTDIRS),testp-$i)
+
 syncfttest mpisyncfttest: $(foreach i,$(filter $(FTDIRS),$(TESTDIRS)),test-$i)
 
 clean: $(foreach i,$(DIRS),clean-$i)
@@ -31,6 +33,9 @@ $(foreach i,$(DIRS),build-$i):
 $(foreach i,$(DIRS),test-$i):
 	$(MAKE) -C $(subst test-,,$@) test OPTS='$(OPTS)' TESTOPTS='$(TESTOPTS)'
 
+$(foreach i,$(DIRS),testp-$i):
+	$(MAKE) -C $(subst testp-,,$@) testp OPTS='$(OPTS)' TESTOPTS='$(TESTOPTS)' P='$(P)'
+
 $(foreach i,$(DIRS),clean-$i):
 	$(MAKE) -C $(subst clean-,,$@) clean OPTS='$(OPTS)'
 

tests/converse/Makefile

@@ -14,6 +14,8 @@ ifneq ($(CMK_MULTICORE),1)
 endif
 endif
 
+testp: $(foreach i,$(TESTDIRS),testp-$i)
+
 smptest: $(foreach i,$(TESTDIRS),smptest-$i)
 
 clean: $(foreach i,$(DIRS),clean-$i)
@@ -26,6 +28,9 @@ $(foreach i,$(DIRS),build-$i):
 $(foreach i,$(DIRS),test-$i):
 	$(MAKE) -C $(subst test-,,$@) test OPTS='$(OPTS)' TESTOPTS='$(TESTOPTS)'
 
+$(foreach i,$(DIRS),testp-$i):
+	$(MAKE) -C $(subst testp-,,$@) testp OPTS='$(OPTS)' TESTOPTS='$(TESTOPTS)' P='$(P)'
+
 $(foreach i,$(DIRS),smptest-$i):
 	$(MAKE) -C $(subst smptest-,,$@) smptest OPTS='$(OPTS)' TESTOPTS='$(TESTOPTS)'
 

tests/converse/megacon/Makefile

@@ -120,3 +120,6 @@ test: pgm
 smptest: pgm
 	$(call run, ./pgm +p2 ++ppn 2)
 	$(call run, ./pgm +p4 ++ppn 2)
+
+testp: pgm
+	$(call run, ./pgm +p$(P) )

tests/util/Makefile

@@ -20,11 +20,15 @@ headerpad.decl.h: headerpad.ci
 headerpad.o: headerpad.C headerpad.decl.h headerpad.h
 	$(CHARMC) -c headerpad.C
 
-
 test: check
 	$(call run, +p4 ./check 4)
 	@echo tests if MACHINE_DEBUG is enabled in machine.h and fails if it is set
 	@if test -f "debugLog.0"; then echo "MACHINE_DEBUG is enabled"; false; fi
 
+testp: check
+	$(call run, +p$(P) ./check $(P))
+	@echo tests if MACHINE_DEBUG is enabled in machine.h and fails if it is set
+	@if test -f "debugLog.0"; then echo "MACHINE_DEBUG is enabled"; false; fi
+
 clean:
 	rm -f conv-host *.o *.bak *.log check.sts *~ charmrun charmrun.exe check check.exe check.pdb check.ilk debugLog.*