d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

app/test: introduce resources for tests

Browse Source 
Certain internal mechanisms of DPDK access different file system
structures (e.g. /sys/bus/pci/devices). It is difficult to test
those cases automatically by a unit test when such path is not
hard-coded and there is no simple way how to distribute fake ones
with the current testing environment.

This patch adds a possibility to declare a resource embedded in
the test binary itself. The structure resource cover the generic
situation - it provides a name for lookup and pointers to the
embedded data blob. A resource is registered in a constructor by
the macro REGISTER_RESOURCE.

Some initial tests of simple resources is included and added into
the group_1.

Signed-off-by: Jan Viktorin <viktorin@rehivetech.com>
This commit is contained in:
Jan Viktorin 2016-06-13 17:07:36 +02:00 committed by Thomas Monjalon
parent 99d6231fdc
commit fe6923cbfd
6 changed files with 249 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -554,9 +554,11 @@ F: app/test/commands.c
F: app/test/packet_burst_generator.c
F: app/test/packet_burst_generator.h
F: app/test/process.h
F: app/test/resource.*
F: app/test/test.c
F: app/test/test.h
F: app/test/test_pmd_perf.c
F: app/test/test_resource.c
F: app/test/virtual_pmd.c
F: app/test/virtual_pmd.h

2
app/test/Makefile
View File

@ -43,6 +43,8 @@ APP = test
#
SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) := commands.c
SRCS-y += test.c
SRCS-y += resource.c
SRCS-y += test_resource.c
SRCS-y += test_pci.c
SRCS-y += test_prefetch.c
SRCS-y += test_byteorder.c

6
app/test/autotest_data.py
View File

@ -93,6 +93,12 @@ parallel_test_group_list = [
"Func" : default_autotest,
"Report" : None,
},
{
"Name" : "Resource autotest",
"Command" : "resource_autotest",
"Func" : default_autotest,
"Report" : None,
},
{
"Name" : "Dump rings",
"Command" : "dump_ring",

66
app/test/resource.c Normal file
View File

@ -0,0 +1,66 @@
/*-
* BSD LICENSE
*
* Copyright(c) 2016 RehiveTech. 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
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name of RehiveTech 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
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <string.h>
#include <errno.h>
#include <sys/queue.h>
#include <rte_debug.h>
#include "resource.h"
struct resource_list resource_list = TAILQ_HEAD_INITIALIZER(resource_list);
size_t resource_size(const struct resource *r)
{
return r->end - r->begin;
}
const struct resource *resource_find(const char *name)
{
struct resource *r;
TAILQ_FOREACH(r, &resource_list, next) {
RTE_VERIFY(r->name);
if (!strcmp(r->name, name))
return r;
}
return NULL;
}
void resource_register(struct resource *r)
{
TAILQ_INSERT_TAIL(&resource_list, r, next);
}

98
app/test/resource.h Normal file
View File

@ -0,0 +1,98 @@
/*-
* BSD LICENSE
*
* Copyright(c) 2016 RehiveTech. 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
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name of RehiveTech 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
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _RESOURCE_H_
#define _RESOURCE_H_
/**
* @file
*
* Test Resource API
*
* Each test can require and use some external resources. Usually, an external
* resource is a file or a filesystem sub-hierarchy. A resource is included
* inside the test executable.
*/
#include <sys/queue.h>
#include <stddef.h>
#include <rte_eal.h>
#include <rte_common.h>
TAILQ_HEAD(resource_list, resource);
extern struct resource_list resource_list;
/**
* Representation of a resource. It points to the resource's binary data.
* The semantics of the binary data are defined by the target test.
*/
struct resource {
const char *name; /**< Unique name of the resource */
const char *begin; /**< Start of resource data */
const char *end; /**< End of resource data */
TAILQ_ENTRY(resource) next;
};
/**
* @return size of the given resource
*/
size_t resource_size(const struct resource *r);
/**
* Find a resource by name in the global list of resources.
*/
const struct resource *resource_find(const char *name);
/**
* Register a resource in the global list of resources.
* Not intended for direct use, please check the REGISTER_RESOURCE
* macro.
*/
void resource_register(struct resource *r);
/**
* Definition of a resource described by its name, and pointers begin, end.
*/
#define REGISTER_RESOURCE(n, b, e) \
static struct resource linkres_ ##n = { \
.name = RTE_STR(n), \
.begin = b, \
.end = e, \
}; \
static void __attribute__((constructor, used)) resinitfn_ ##n(void) \
{ \
resource_register(&linkres_ ##n); \
}
#endif

75
app/test/test_resource.c Normal file
View File

@ -0,0 +1,75 @@
/*-
* BSD LICENSE
*
* Copyright(c) 2016 RehiveTech. 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
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * Neither the name of RehiveTech 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
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <stdio.h>
#include <string.h>
#include "test.h"
#include "resource.h"
const char test_resource_dpdk_blob[] = {
'\x44', '\x50', '\x44', '\x4b', '\x00'
};
REGISTER_RESOURCE(test_resource_dpdk,
test_resource_dpdk_blob, test_resource_dpdk_blob + 4);
static int test_resource_dpdk(void)
{
const struct resource *r;
r = resource_find("test_resource_dpdk");
TEST_ASSERT_NOT_NULL(r, "Could not find test_resource_dpdk");
TEST_ASSERT(!strcmp(r->name, "test_resource_dpdk"),
"Found resource %s, expected test_resource_dpdk",
r->name);
TEST_ASSERT(!strncmp("DPDK", r->begin, 4),
"Unexpected payload: %.4s...", r->begin);
return 0;
}
static int test_resource(void)
{
if (test_resource_dpdk())
return -1;
return 0;
}
static struct test_command resource_cmd = {
.command = "resource_autotest",
.callback = test_resource,
};
REGISTER_TEST_COMMAND(resource_cmd);