From: Jan Viktorin <viktorin@rehivetech.com>
To: dev@dpdk.org
Cc: Jan Viktorin <viktorin@rehivetech.com>,
Thomas Monjalon <thomas.monjalon@6wind.com>,
David Marchand <david.marchand@6wind.com>,
Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [PATCH v5 04/10] app/test: add functions to create files from resources
Date: Mon, 13 Jun 2016 17:07:39 +0200 [thread overview]
Message-ID: <1465830465-30058-5-git-send-email-viktorin@rehivetech.com> (raw)
In-Reply-To: <1465830465-30058-1-git-send-email-viktorin@rehivetech.com>
In-Reply-To: <1465805550-30640-1-git-send-email-viktorin@rehivetech.com>
A resource can be written into the target filesystem by calling
resource_fwrite or resource_fwrite_file. Such file can be created
before a test is started and removed after the test finishes.
Signed-off-by: Jan Viktorin <viktorin@rehivetech.com>
---
app/test/resource.c | 35 +++++++++++++++++++++++++++++++++++
app/test/resource.h | 14 ++++++++++++++
app/test/test_resource.c | 10 ++++++++++
3 files changed, 59 insertions(+)
diff --git a/app/test/resource.c b/app/test/resource.c
index 30513db..acb63c1 100644
--- a/app/test/resource.c
+++ b/app/test/resource.c
@@ -31,6 +31,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <sys/queue.h>
@@ -60,6 +61,40 @@ const struct resource *resource_find(const char *name)
return NULL;
}
+int resource_fwrite(const struct resource *r, FILE *f)
+{
+ const size_t goal = resource_size(r);
+ size_t total = 0;
+
+ while (total < goal) {
+ size_t wlen = fwrite(r->begin + total, 1, goal - total, f);
+ if (wlen == 0) {
+ perror(__func__);
+ return -1;
+ }
+
+ total += wlen;
+ }
+
+ return 0;
+}
+
+int resource_fwrite_file(const struct resource *r, const char *fname)
+{
+ FILE *f;
+ int ret;
+
+ f = fopen(fname, "w");
+ if (f == NULL) {
+ perror(__func__);
+ return -1;
+ }
+
+ ret = resource_fwrite(r, f);
+ fclose(f);
+ return ret;
+}
+
void resource_register(struct resource *r)
{
TAILQ_INSERT_TAIL(&resource_list, r, next);
diff --git a/app/test/resource.h b/app/test/resource.h
index 966fc24..ac9cae6 100644
--- a/app/test/resource.h
+++ b/app/test/resource.h
@@ -45,6 +45,7 @@
*/
#include <sys/queue.h>
+#include <stdio.h>
#include <stddef.h>
#include <rte_eal.h>
@@ -75,6 +76,19 @@ size_t resource_size(const struct resource *r);
const struct resource *resource_find(const char *name);
/**
+ * Write the raw data of the resource to the given file.
+ * @return 0 on success
+ */
+int resource_fwrite(const struct resource *r, FILE *f);
+
+/**
+ * Write the raw data of the resource to the given file given by name.
+ * The name is relative to the current working directory.
+ * @return 0 on success
+ */
+int resource_fwrite_file(const struct resource *r, const char *fname);
+
+/**
* Register a resource in the global list of resources.
* Not intended for direct use, please check the REGISTER_RESOURCE
* macro.
diff --git a/app/test/test_resource.c b/app/test/test_resource.c
index b397fa8..3d1bf00 100644
--- a/app/test/test_resource.c
+++ b/app/test/test_resource.c
@@ -65,6 +65,7 @@ REGISTER_LINKED_RESOURCE(test_resource_c);
static int test_resource_c(void)
{
const struct resource *r;
+ FILE *f;
r = resource_find("test_resource_c");
TEST_ASSERT_NOT_NULL(r, "No test_resource_c found");
@@ -72,6 +73,15 @@ static int test_resource_c(void)
"Found resource %s, expected test_resource_c",
r->name);
+ TEST_ASSERT_SUCCESS(resource_fwrite_file(r, "test_resource.c"),
+ "Failed to to write file %s", r->name);
+
+ f = fopen("test_resource.c", "r");
+ TEST_ASSERT_NOT_NULL(f,
+ "Missing extracted file resource.c");
+ fclose(f);
+ remove("test_resource.c");
+
return 0;
}
--
2.8.0
next prev parent reply other threads:[~2016-06-13 15:12 UTC|newest]
Thread overview: 111+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-29 13:11 [dpdk-dev] [RFC 0/4] Include resources in tests Jan Viktorin
2016-04-29 13:11 ` [dpdk-dev] [RFC 1/4] app/test: introduce resources for tests Jan Viktorin
2016-04-29 13:11 ` [dpdk-dev] [RFC 2/4] app/test: support resources externally linked Jan Viktorin
2016-04-29 13:11 ` [dpdk-dev] [RFC 3/4] app/test: add functions to create files from resources Jan Viktorin
2016-04-29 13:11 ` [dpdk-dev] [RFC 4/4] app/test: support resources archived by tar Jan Viktorin
2016-05-05 13:33 ` Bruce Richardson
2016-05-05 17:05 ` Jan Viktorin
2016-05-06 9:02 ` Bruce Richardson
2016-04-29 14:42 ` [dpdk-dev] [RFC 0/4] Include resources in tests Bruce Richardson
2016-04-29 20:52 ` Jan Viktorin
2016-05-05 13:29 ` Bruce Richardson
2016-05-05 17:03 ` Jan Viktorin
2016-05-06 9:03 ` Bruce Richardson
2016-05-06 10:48 ` [dpdk-dev] [PATCH v1 00/10] " Jan Viktorin
2016-05-06 10:48 ` [dpdk-dev] [PATCH v1 01/10] app/test: introduce resources for tests Jan Viktorin
2016-05-06 14:01 ` Thomas Monjalon
2016-05-06 16:20 ` Jan Viktorin
2016-05-12 14:58 ` Thomas Monjalon
2016-05-12 15:01 ` Jan Viktorin
2016-05-09 15:36 ` Jan Viktorin
2016-05-06 10:48 ` [dpdk-dev] [PATCH v1 02/10] app/test: support resources externally linked Jan Viktorin
2016-05-06 14:32 ` Thomas Monjalon
2016-05-06 16:31 ` Jan Viktorin
2016-05-09 15:19 ` Jan Viktorin
2016-05-12 15:05 ` Thomas Monjalon
2016-05-06 10:48 ` [dpdk-dev] [PATCH v1 03/10] app/test: add functions to create files from resources Jan Viktorin
2016-05-06 10:48 ` [dpdk-dev] [PATCH v1 04/10] app/test: support resources archived by tar Jan Viktorin
2016-05-12 15:26 ` Thomas Monjalon
2016-05-12 15:28 ` Thomas Monjalon
2016-05-06 10:48 ` [dpdk-dev] [PATCH v1 05/10] app/test: use linked list to store PCI drivers Jan Viktorin
2016-05-06 10:48 ` [dpdk-dev] [PATCH v1 06/10] app/test: extract test_pci_setup and test_pci_cleanup Jan Viktorin
2016-05-06 10:48 ` [dpdk-dev] [PATCH v1 07/10] app/test: convert current pci_test into a single test case Jan Viktorin
2016-05-06 10:48 ` [dpdk-dev] [PATCH v1 08/10] eal/pci: replace SYSFS_PCI_DEVICES with pci_get_sysfs_path() Jan Viktorin
2016-05-06 10:48 ` [dpdk-dev] [PATCH v1 09/10] app/test: scan PCI bus using a fake sysfs Jan Viktorin
2016-05-06 10:48 ` [dpdk-dev] [PATCH v1 10/10] app/test: do not dump PCI devices in blacklist test Jan Viktorin
2016-05-10 18:13 ` [dpdk-dev] [PATCH v2 00/11] Include resources in tests Jan Viktorin
2016-05-10 18:13 ` [dpdk-dev] [PATCH v2 01/11] app/test: introduce resources for tests Jan Viktorin
2016-05-12 15:13 ` Thomas Monjalon
2016-05-12 15:19 ` Thomas Monjalon
2016-05-12 15:26 ` Jan Viktorin
2016-05-10 18:13 ` [dpdk-dev] [PATCH v2 02/11] mk: define objcopy-specific target and arch Jan Viktorin
2016-05-10 18:13 ` [dpdk-dev] [PATCH v2 03/11] app/test: support resources externally linked Jan Viktorin
2016-05-10 18:13 ` [dpdk-dev] [PATCH v2 04/11] app/test: add functions to create files from resources Jan Viktorin
2016-05-10 18:13 ` [dpdk-dev] [PATCH v2 05/11] app/test: support resources archived by tar Jan Viktorin
2016-05-10 18:13 ` [dpdk-dev] [PATCH v2 06/11] app/test: use linked list to store PCI drivers Jan Viktorin
2016-05-12 15:31 ` Thomas Monjalon
2016-05-12 15:53 ` Jan Viktorin
2016-05-12 16:08 ` Thomas Monjalon
2016-05-12 21:00 ` Jan Viktorin
2016-05-12 21:44 ` Thomas Monjalon
2016-05-10 18:13 ` [dpdk-dev] [PATCH v2 07/11] app/test: extract test_pci_setup and test_pci_cleanup Jan Viktorin
2016-05-10 18:13 ` [dpdk-dev] [PATCH v2 08/11] app/test: convert current pci_test into a single test case Jan Viktorin
2016-05-12 15:34 ` Thomas Monjalon
2016-05-13 15:19 ` Jan Viktorin
2016-05-13 15:35 ` Thomas Monjalon
2016-05-10 18:13 ` [dpdk-dev] [PATCH v2 09/11] eal/pci: replace SYSFS_PCI_DEVICES with pci_get_sysfs_path() Jan Viktorin
2016-05-12 15:41 ` Thomas Monjalon
2016-05-12 15:46 ` Jan Viktorin
2016-05-12 16:10 ` Thomas Monjalon
2016-05-13 15:26 ` Jan Viktorin
2016-05-12 15:44 ` Thomas Monjalon
2016-05-10 18:13 ` [dpdk-dev] [PATCH v2 10/11] app/test: scan PCI bus using a fake sysfs Jan Viktorin
2016-05-10 18:13 ` [dpdk-dev] [PATCH v2 11/11] app/test: do not dump PCI devices in blacklist test Jan Viktorin
2016-05-17 18:34 ` [dpdk-dev] [PATCH v3 00/11] Include resources in tests Jan Viktorin
2016-06-13 8:12 ` [dpdk-dev] [PATCH v4 00/10] " Jan Viktorin
2016-06-13 8:20 ` Jan Viktorin
2016-06-13 15:07 ` [dpdk-dev] [PATCH v5 " Jan Viktorin
2016-06-13 18:32 ` Thomas Monjalon
2016-06-14 8:23 ` Hunt, David
2016-06-14 8:37 ` Thomas Monjalon
2016-06-14 8:59 ` [dpdk-dev] [PATCH] config: make libarchive optional Thomas Monjalon
2016-06-14 9:33 ` Jan Viktorin
2016-06-14 9:50 ` Thomas Monjalon
2016-06-14 10:01 ` [dpdk-dev] [PATCH v2] " Thomas Monjalon
2016-06-14 12:53 ` Jan Viktorin
2016-06-14 13:33 ` Thomas Monjalon
2016-06-13 15:07 ` [dpdk-dev] [PATCH v5 01/10] app/test: introduce resources for tests Jan Viktorin
2016-06-13 15:07 ` [dpdk-dev] [PATCH v5 02/10] mk: define objcopy-specific target and arch Jan Viktorin
2016-06-13 15:07 ` [dpdk-dev] [PATCH v5 03/10] app/test: support resources externally linked Jan Viktorin
2016-06-13 15:07 ` Jan Viktorin [this message]
2016-06-13 15:07 ` [dpdk-dev] [PATCH v5 05/10] app/test: support resources archived by tar Jan Viktorin
2016-06-13 15:07 ` [dpdk-dev] [PATCH v5 06/10] app/test: use linked list to store PCI drivers Jan Viktorin
2016-06-13 15:07 ` [dpdk-dev] [PATCH v5 07/10] app/test: extract test_pci_setup and test_pci_cleanup Jan Viktorin
2016-06-13 15:07 ` [dpdk-dev] [PATCH v5 08/10] app/test: convert current pci_test into a single test case Jan Viktorin
2016-06-13 15:07 ` [dpdk-dev] [PATCH v5 09/10] eal/pci: allow to override sysfs Jan Viktorin
2016-06-13 15:07 ` [dpdk-dev] [PATCH v5 10/10] app/test: do not dump PCI devices in blacklist test Jan Viktorin
2016-06-13 8:12 ` [dpdk-dev] [PATCH v4 01/10] app/test: introduce resources for tests Jan Viktorin
2016-06-13 8:12 ` [dpdk-dev] [PATCH v4 02/10] mk: define objcopy-specific target and arch Jan Viktorin
2016-06-13 8:12 ` [dpdk-dev] [PATCH v4 03/10] app/test: support resources externally linked Jan Viktorin
2016-06-13 8:12 ` [dpdk-dev] [PATCH v4 04/10] app/test: add functions to create files from resources Jan Viktorin
2016-06-13 8:12 ` [dpdk-dev] [PATCH v4 05/10] app/test: support resources archived by tar Jan Viktorin
2016-06-13 14:40 ` Thomas Monjalon
2016-06-13 14:43 ` Jan Viktorin
2016-06-13 8:12 ` [dpdk-dev] [PATCH v4 06/10] app/test: use linked list to store PCI drivers Jan Viktorin
2016-06-13 8:12 ` [dpdk-dev] [PATCH v4 07/10] app/test: extract test_pci_setup and test_pci_cleanup Jan Viktorin
2016-06-13 8:12 ` [dpdk-dev] [PATCH v4 08/10] app/test: convert current pci_test into a single test case Jan Viktorin
2016-06-13 8:12 ` [dpdk-dev] [PATCH v4 09/10] eal/pci: allow to override sysfs Jan Viktorin
2016-06-13 8:12 ` [dpdk-dev] [PATCH v4 10/10] app/test: do not dump PCI devices in blacklist test Jan Viktorin
2016-05-17 18:34 ` [dpdk-dev] [PATCH v3 01/11] app/test: introduce resources for tests Jan Viktorin
2016-05-19 8:51 ` Jan Viktorin
2016-05-17 18:34 ` [dpdk-dev] [PATCH v3 02/11] mk: define objcopy-specific target and arch Jan Viktorin
2016-05-17 18:34 ` [dpdk-dev] [PATCH v3 03/11] app/test: support resources externally linked Jan Viktorin
2016-05-17 18:34 ` [dpdk-dev] [PATCH v3 04/11] app/test: add functions to create files from resources Jan Viktorin
2016-05-17 18:34 ` [dpdk-dev] [PATCH v3 05/11] app/test: support resources archived by tar Jan Viktorin
2016-05-17 18:34 ` [dpdk-dev] [PATCH v3 06/11] app/test: use linked list to store PCI drivers Jan Viktorin
2016-05-17 18:34 ` [dpdk-dev] [PATCH v3 07/11] app/test: extract test_pci_setup and test_pci_cleanup Jan Viktorin
2016-05-17 18:34 ` [dpdk-dev] [PATCH v3 08/11] app/test: convert current pci_test into a single test case Jan Viktorin
2016-05-17 18:34 ` [dpdk-dev] [PATCH v3 09/11] eal/pci: allow to override sysfs Jan Viktorin
2016-05-19 8:51 ` Jan Viktorin
2016-05-17 18:35 ` [dpdk-dev] [PATCH v3 10/11] app/test: scan PCI bus using a fake sysfs Jan Viktorin
2016-05-17 18:35 ` [dpdk-dev] [PATCH v3 11/11] app/test: do not dump PCI devices in blacklist test Jan Viktorin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465830465-30058-5-git-send-email-viktorin@rehivetech.com \
--to=viktorin@rehivetech.com \
--cc=bruce.richardson@intel.com \
--cc=david.marchand@6wind.com \
--cc=dev@dpdk.org \
--cc=thomas.monjalon@6wind.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).