[v4,9/9] mk: update make targets for classified testcases

Message ID 1531833331-18148-10-git-send-email-reshma.pattan@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series Make unit tests great again |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Pattan, Reshma July 17, 2018, 1:15 p.m. UTC
  Makefiles are updated with new test case lists.
Test cases are classified as -
P1 - Main test cases,
P2 - Cryptodev/driver test cases,
P3 - Perf test cases which takes longer than 10s,
P4 - Logging/Dump test cases.

Makefile is updated with different targets
for the above classified groups.
Test cases for different targets are listed accordingly.

Cc: stable@dpdk.org

Signed-off-by: Jananee Parthasarathy <jananeex.m.parthasarathy@intel.com>
Reviewed-by: Reshma Pattan <reshma.pattan@intel.com>
---
 mk/rte.sdkroot.mk |  4 ++--
 mk/rte.sdktest.mk | 33 +++++++++++++++++++++++++++------
 2 files changed, 29 insertions(+), 8 deletions(-)
  

Comments

Burakov, Anatoly July 17, 2018, 2:33 p.m. UTC | #1
On 17-Jul-18 2:15 PM, Reshma Pattan wrote:
> Makefiles are updated with new test case lists.
> Test cases are classified as -
> P1 - Main test cases,
> P2 - Cryptodev/driver test cases,
> P3 - Perf test cases which takes longer than 10s,
> P4 - Logging/Dump test cases.
> 
> Makefile is updated with different targets
> for the above classified groups.
> Test cases for different targets are listed accordingly.
> 
> Cc: stable@dpdk.org
> 
> Signed-off-by: Jananee Parthasarathy <jananeex.m.parthasarathy@intel.com>
> Reviewed-by: Reshma Pattan <reshma.pattan@intel.com>
> ---
>   mk/rte.sdkroot.mk |  4 ++--
>   mk/rte.sdktest.mk | 33 +++++++++++++++++++++++++++------
>   2 files changed, 29 insertions(+), 8 deletions(-)
> 
> diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk
> index f43cc7829..ea3473ebf 100644
> --- a/mk/rte.sdkroot.mk
> +++ b/mk/rte.sdkroot.mk
> @@ -68,8 +68,8 @@ config defconfig showconfigs showversion showversionum:
>   cscope gtags tags etags:
>   	$(Q)$(RTE_SDK)/devtools/build-tags.sh $@ $T
>   
> -.PHONY: test test-basic test-fast test-ring test-mempool test-perf coverage
> -test test-basic test-fast test-ring test-mempool test-perf coverage:
> +.PHONY: test test-basic test-fast test-ring test-mempool test-perf coverage test-drivers test-dump
> +test test-basic test-fast test-ring test-mempool test-perf coverage test-drivers test-dump:

I'm probably missing something, but i can only see definitions for 
coverage, test-fast, test-perf, test-drivers and test-dump.

What is the difference between test and test-basic, and what is 
test-mempool? If they are unused, they should be removed.

>   	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktest.mk $@
>   
>   test: test-build
> diff --git a/mk/rte.sdktest.mk b/mk/rte.sdktest.mk
> index ee1fe0c7e..13d1efb6a 100644
> --- a/mk/rte.sdktest.mk
> +++ b/mk/rte.sdktest.mk
> @@ -18,14 +18,35 @@ DIR := $(shell basename $(RTE_OUTPUT))
>   #
>   # test: launch auto-tests, very simple for now.
>   #
> -.PHONY: test test-basic test-fast test-perf coverage
> +.PHONY: test test-basic test-fast test-perf test-drivers test-dump coverage
>   
> -PERFLIST=ring_perf,mempool_perf,memcpy_perf,hash_perf,timer_perf
> -coverage: BLACKLIST=-$(PERFLIST)
> -test-fast: BLACKLIST=-$(PERFLIST)
> -test-perf: WHITELIST=$(PERFLIST)
> +PERFLIST=ring_perf,mempool_perf,memcpy_perf,hash_perf,timer_perf,\
> +         reciprocal_division,reciprocal_division_perf,lpm_perf,red_all,\
> +         barrier,hash_multiwriter,timer_racecond,efd,hash_functions,\
> +         eventdev_selftest_sw,member_perf,efd_perf,lpm6_perf,red_perf,\
> +         distributor_perf,ring_pmd_perf,pmd_perf,ring_perf
> +DRIVERSLIST=link_bonding,link_bonding_mode4,link_bonding_rssconf,\
> +            cryptodev_sw_mrvl,cryptodev_dpaa2_sec,cryptodev_dpaa_sec,\
> +            cryptodev_qat,cryptodev_aesni_mb,cryptodev_openssl,\
> +            cryptodev_scheduler,cryptodev_aesni_gcm,cryptodev_null,\
> +            cryptodev_sw_snow3g,cryptodev_sw_kasumi,cryptodev_sw_zuc
> +DUMPLIST=dump_struct_sizes,dump_mempool,dump_malloc_stats,dump_devargs,\
> +         dump_log_types,dump_ring,quit,dump_physmem,dump_memzone,\
> +         devargs_autotest
>   
> -test test-basic test-fast test-perf:
> +SPACESTR:=
> +SPACESTR+=
> +STRIPPED_PERFLIST=$(subst $(SPACESTR),,$(PERFLIST))
> +STRIPPED_DRIVERSLIST=$(subst $(SPACESTR),,$(DRIVERSLIST))
> +STRIPPED_DUMPLIST=$(subst $(SPACESTR),,$(DUMPLIST))
> +
> +coverage: BLACKLIST=-$(STRIPPED_PERFLIST)
> +test-fast: BLACKLIST=-$(STRIPPED_PERFLIST),$(STRIPPED_DRIVERSLIST),$(STRIPPED_DUMPLIST)
> +test-perf: WHITELIST=$(STRIPPED_PERFLIST)
> +test-drivers: WHITELIST=$(STRIPPED_DRIVERSLIST)
> +test-dump: WHITELIST=$(STRIPPED_DUMPLIST)
> +
> +test test-basic test-fast test-perf test-drivers test-dump:
>   	@mkdir -p $(AUTOTEST_DIR) ; \
>   	cd $(AUTOTEST_DIR) ; \
>   	if [ -f $(RTE_OUTPUT)/app/test ]; then \
>
  
Burakov, Anatoly July 17, 2018, 2:40 p.m. UTC | #2
On 17-Jul-18 2:15 PM, Reshma Pattan wrote:
> Makefiles are updated with new test case lists.
> Test cases are classified as -
> P1 - Main test cases,
> P2 - Cryptodev/driver test cases,
> P3 - Perf test cases which takes longer than 10s,
> P4 - Logging/Dump test cases.
> 
> Makefile is updated with different targets
> for the above classified groups.
> Test cases for different targets are listed accordingly.
> 
> Cc: stable@dpdk.org
> 
> Signed-off-by: Jananee Parthasarathy <jananeex.m.parthasarathy@intel.com>
> Reviewed-by: Reshma Pattan <reshma.pattan@intel.com>
> ---
>   mk/rte.sdkroot.mk |  4 ++--
>   mk/rte.sdktest.mk | 33 +++++++++++++++++++++++++++------
>   2 files changed, 29 insertions(+), 8 deletions(-)
> 
> diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk
> index f43cc7829..ea3473ebf 100644
> --- a/mk/rte.sdkroot.mk
> +++ b/mk/rte.sdkroot.mk
> @@ -68,8 +68,8 @@ config defconfig showconfigs showversion showversionum:
>   cscope gtags tags etags:
>   	$(Q)$(RTE_SDK)/devtools/build-tags.sh $@ $T
>   
> -.PHONY: test test-basic test-fast test-ring test-mempool test-perf coverage
> -test test-basic test-fast test-ring test-mempool test-perf coverage:
> +.PHONY: test test-basic test-fast test-ring test-mempool test-perf coverage test-drivers test-dump
> +test test-basic test-fast test-ring test-mempool test-perf coverage test-drivers test-dump:
>   	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktest.mk $@
>   
>   test: test-build
> diff --git a/mk/rte.sdktest.mk b/mk/rte.sdktest.mk
> index ee1fe0c7e..13d1efb6a 100644
> --- a/mk/rte.sdktest.mk
> +++ b/mk/rte.sdktest.mk
> @@ -18,14 +18,35 @@ DIR := $(shell basename $(RTE_OUTPUT))
>   #
>   # test: launch auto-tests, very simple for now.
>   #
> -.PHONY: test test-basic test-fast test-perf coverage
> +.PHONY: test test-basic test-fast test-perf test-drivers test-dump coverage
>   
> -PERFLIST=ring_perf,mempool_perf,memcpy_perf,hash_perf,timer_perf
> -coverage: BLACKLIST=-$(PERFLIST)
> -test-fast: BLACKLIST=-$(PERFLIST)
> -test-perf: WHITELIST=$(PERFLIST)
> +PERFLIST=ring_perf,mempool_perf,memcpy_perf,hash_perf,timer_perf,\
> +         reciprocal_division,reciprocal_division_perf,lpm_perf,red_all,\
> +         barrier,hash_multiwriter,timer_racecond,efd,hash_functions,\
> +         eventdev_selftest_sw,member_perf,efd_perf,lpm6_perf,red_perf,\
> +         distributor_perf,ring_pmd_perf,pmd_perf,ring_perf
> +DRIVERSLIST=link_bonding,link_bonding_mode4,link_bonding_rssconf,\
> +            cryptodev_sw_mrvl,cryptodev_dpaa2_sec,cryptodev_dpaa_sec,\
> +            cryptodev_qat,cryptodev_aesni_mb,cryptodev_openssl,\
> +            cryptodev_scheduler,cryptodev_aesni_gcm,cryptodev_null,\
> +            cryptodev_sw_snow3g,cryptodev_sw_kasumi,cryptodev_sw_zuc
> +DUMPLIST=dump_struct_sizes,dump_mempool,dump_malloc_stats,dump_devargs,\
> +         dump_log_types,dump_ring,quit,dump_physmem,dump_memzone,\
> +         devargs_autotest

Also, why is "quit" and "devargs_autotest" in dump list?
  
Pattan, Reshma July 17, 2018, 3:18 p.m. UTC | #3
Hi,

> -----Original Message-----
> From: Burakov, Anatoly
> Sent: Tuesday, July 17, 2018 3:40 PM
> To: Pattan, Reshma <reshma.pattan@intel.com>; thomas@monjalon.net;
> dev@dpdk.org
> Cc: Parthasarathy, JananeeX M <jananeex.m.parthasarathy@intel.com>;
> stable@dpdk.org
> Subject: Re: [PATCH v4 9/9] mk: update make targets for classified testcases
> 
> +DUMPLIST=dump_struct_sizes,dump_mempool,dump_malloc_stats,dump_
> devargs,\
> > +         dump_log_types,dump_ring,quit,dump_physmem,dump_memzone,\
> > +         devargs_autotest
> 
> Also, why is "quit" and "devargs_autotest" in dump list?

I did not check this while merging the changes, will remove them from the dump list.
  
Pattan, Reshma July 17, 2018, 3:23 p.m. UTC | #4
Hi,

> -----Original Message-----
> From: Burakov, Anatoly
> Sent: Tuesday, July 17, 2018 3:34 PM
> To: Pattan, Reshma <reshma.pattan@intel.com>; thomas@monjalon.net;
> dev@dpdk.org
> Cc: Parthasarathy, JananeeX M <jananeex.m.parthasarathy@intel.com>;
> stable@dpdk.org
> Subject: Re: [PATCH v4 9/9] mk: update make targets for classified testcases
> 
> On 17-Jul-18 2:15 PM, Reshma Pattan wrote:
> > Makefiles are updated with new test case lists.
> > Test cases are classified as -
> > P1 - Main test cases,
> > P2 - Cryptodev/driver test cases,
> > P3 - Perf test cases which takes longer than 10s,
> > P4 - Logging/Dump test cases.
> >
> > Makefile is updated with different targets for the above classified
> > groups.
> > Test cases for different targets are listed accordingly.
> >
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Jananee Parthasarathy
> > <jananeex.m.parthasarathy@intel.com>
> > Reviewed-by: Reshma Pattan <reshma.pattan@intel.com>
> > ---
> >   mk/rte.sdkroot.mk |  4 ++--
> >   mk/rte.sdktest.mk | 33 +++++++++++++++++++++++++++------
> >   2 files changed, 29 insertions(+), 8 deletions(-)
> >
> > diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk index
> > f43cc7829..ea3473ebf 100644
> > --- a/mk/rte.sdkroot.mk
> > +++ b/mk/rte.sdkroot.mk
> > @@ -68,8 +68,8 @@ config defconfig showconfigs showversion
> showversionum:
> >   cscope gtags tags etags:
> >   	$(Q)$(RTE_SDK)/devtools/build-tags.sh $@ $T
> >
> > -.PHONY: test test-basic test-fast test-ring test-mempool test-perf
> > coverage -test test-basic test-fast test-ring test-mempool test-perf coverage:
> > +.PHONY: test test-basic test-fast test-ring test-mempool test-perf
> > +coverage test-drivers test-dump test test-basic test-fast test-ring test-
> mempool test-perf coverage test-drivers test-dump:
> 
> I'm probably missing something, but i can only see definitions for coverage,
> test-fast, test-perf, test-drivers and test-dump.
> 
> What is the difference between test and test-basic, and what is test-
> mempool? If they are unused, they should be removed.
> 

test-mempool was there from legacy  though it is not useful after looking at the make file. Will remove.

make test : this runs all the UTs that are there in autotest_data.py
make test-basic:  it is same as make test.

Will remove test-mempool and make test-basic then in a separate patch.

Thanks,
Reshma
  

Patch

diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk
index f43cc7829..ea3473ebf 100644
--- a/mk/rte.sdkroot.mk
+++ b/mk/rte.sdkroot.mk
@@ -68,8 +68,8 @@  config defconfig showconfigs showversion showversionum:
 cscope gtags tags etags:
 	$(Q)$(RTE_SDK)/devtools/build-tags.sh $@ $T
 
-.PHONY: test test-basic test-fast test-ring test-mempool test-perf coverage
-test test-basic test-fast test-ring test-mempool test-perf coverage:
+.PHONY: test test-basic test-fast test-ring test-mempool test-perf coverage test-drivers test-dump
+test test-basic test-fast test-ring test-mempool test-perf coverage test-drivers test-dump:
 	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktest.mk $@
 
 test: test-build
diff --git a/mk/rte.sdktest.mk b/mk/rte.sdktest.mk
index ee1fe0c7e..13d1efb6a 100644
--- a/mk/rte.sdktest.mk
+++ b/mk/rte.sdktest.mk
@@ -18,14 +18,35 @@  DIR := $(shell basename $(RTE_OUTPUT))
 #
 # test: launch auto-tests, very simple for now.
 #
-.PHONY: test test-basic test-fast test-perf coverage
+.PHONY: test test-basic test-fast test-perf test-drivers test-dump coverage
 
-PERFLIST=ring_perf,mempool_perf,memcpy_perf,hash_perf,timer_perf
-coverage: BLACKLIST=-$(PERFLIST)
-test-fast: BLACKLIST=-$(PERFLIST)
-test-perf: WHITELIST=$(PERFLIST)
+PERFLIST=ring_perf,mempool_perf,memcpy_perf,hash_perf,timer_perf,\
+         reciprocal_division,reciprocal_division_perf,lpm_perf,red_all,\
+         barrier,hash_multiwriter,timer_racecond,efd,hash_functions,\
+         eventdev_selftest_sw,member_perf,efd_perf,lpm6_perf,red_perf,\
+         distributor_perf,ring_pmd_perf,pmd_perf,ring_perf
+DRIVERSLIST=link_bonding,link_bonding_mode4,link_bonding_rssconf,\
+            cryptodev_sw_mrvl,cryptodev_dpaa2_sec,cryptodev_dpaa_sec,\
+            cryptodev_qat,cryptodev_aesni_mb,cryptodev_openssl,\
+            cryptodev_scheduler,cryptodev_aesni_gcm,cryptodev_null,\
+            cryptodev_sw_snow3g,cryptodev_sw_kasumi,cryptodev_sw_zuc
+DUMPLIST=dump_struct_sizes,dump_mempool,dump_malloc_stats,dump_devargs,\
+         dump_log_types,dump_ring,quit,dump_physmem,dump_memzone,\
+         devargs_autotest
 
-test test-basic test-fast test-perf:
+SPACESTR:=
+SPACESTR+=
+STRIPPED_PERFLIST=$(subst $(SPACESTR),,$(PERFLIST))
+STRIPPED_DRIVERSLIST=$(subst $(SPACESTR),,$(DRIVERSLIST))
+STRIPPED_DUMPLIST=$(subst $(SPACESTR),,$(DUMPLIST))
+
+coverage: BLACKLIST=-$(STRIPPED_PERFLIST)
+test-fast: BLACKLIST=-$(STRIPPED_PERFLIST),$(STRIPPED_DRIVERSLIST),$(STRIPPED_DUMPLIST)
+test-perf: WHITELIST=$(STRIPPED_PERFLIST)
+test-drivers: WHITELIST=$(STRIPPED_DRIVERSLIST)
+test-dump: WHITELIST=$(STRIPPED_DUMPLIST)
+
+test test-basic test-fast test-perf test-drivers test-dump:
 	@mkdir -p $(AUTOTEST_DIR) ; \
 	cd $(AUTOTEST_DIR) ; \
 	if [ -f $(RTE_OUTPUT)/app/test ]; then \