ring: guarantee load/load order in enqueue and dequeue

[dpdk.git] / mk / rte.sdktest.mk

diff --git a/mk/rte.sdktest.mk b/mk/rte.sdktest.mk
index 8c48509..daeea90 100644 (file)
--- a/mk/rte.sdktest.mk
+++ b/mk/rte.sdktest.mk
@@ -1,12 +1,12 @@
 #   BSD LICENSE
-# 
+#
 #   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 #   All rights reserved.
-# 
+#
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
 #   are met:
-# 
+#
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above copyright
@@ -16,7 +16,7 @@
 #     * Neither the name of Intel Corporation nor the names of its
 #       contributors may be used to endorse or promote products derived
 #       from this software without specific prior written permission.
-# 
+#
 #   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 #   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 #   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -46,39 +46,39 @@ DIR := $(shell basename $(RTE_OUTPUT))
 #
 # test: launch auto-tests, very simple for now.
 #
-PHONY: test fast_test
+.PHONY: test test-basic test-fast test-perf coverage
+
+PERFLIST=ring_perf,mempool_perf,memcpy_perf,hash_perf,timer_perf
+coverage: BLACKLIST=-$(PERFLIST)
+test-fast: BLACKLIST=-$(PERFLIST)
+test-perf: WHITELIST=$(PERFLIST)
 
-coverage: BLACKLIST=-Mempool_perf,Memcpy_perf,Hash_perf
-fast_test: BLACKLIST=-Ring_perf,Mempool_perf,Memcpy_perf,Hash_perf,Lpm6
-ring_test: WHITELIST=Ring,Ring_perf
-mempool_test: WHITELIST=Mempool,Mempool_perf
-perf_test:WHITELIST=Mempool_perf,Memcpy_perf,Hash_perf,Ring_perf
-test fast_test ring_test mempool_test perf_test:
+test test-basic test-fast test-perf:
        @mkdir -p $(AUTOTEST_DIR) ; \
        cd $(AUTOTEST_DIR) ; \
        if [ -f $(RTE_OUTPUT)/app/test ]; then \
-               python $(RTE_SDK)/app/test/autotest.py \
+               python $(RTE_SDK)/test/test/autotest.py \
                        $(RTE_OUTPUT)/app/test \
                        $(RTE_TARGET) \
                        $(BLACKLIST) $(WHITELIST); \
        else \
-               echo "No test found, please do a 'make build' first, or specify O=" ; \
+               echo "No test found, please do a 'make test-build' first, or specify O=" ; \
        fi
 
 # this is a special target to ease the pain of running coverage tests
-# this runs all the autotests, cmdline_test script and dump_cfg
+# this runs all the autotests, cmdline_test script and dpdk-procinfo
 coverage:
        @mkdir -p $(AUTOTEST_DIR) ; \
        cd $(AUTOTEST_DIR) ; \
        if [ -f $(RTE_OUTPUT)/app/test ]; then \
-               python $(RTE_SDK)/app/cmdline_test/cmdline_test.py \
+               python $(RTE_SDK)/test/cmdline_test/cmdline_test.py \
                        $(RTE_OUTPUT)/app/cmdline_test; \
                ulimit -S -n 100 ; \
-               python $(RTE_SDK)/app/test/autotest.py \
+               python $(RTE_SDK)/test/test/autotest.py \
                        $(RTE_OUTPUT)/app/test \
                        $(RTE_TARGET) \
                        $(BLACKLIST) $(WHITELIST) ; \
-               $(RTE_OUTPUT)/app/dump_cfg --file-prefix=ring_perf ; \
+               $(RTE_OUTPUT)/app/dpdk-procinfo --file-prefix=ring_perf -- -m; \
        else \
-               echo "No test found, please do a 'make build' first, or specify O=" ;\
+               echo "No test found, please do a 'make test-build' first, or specify O=" ;\
        fi