From patchwork Tue Aug 13 15:57:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 143114 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C0F4F457B3; Tue, 13 Aug 2024 18:00:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D864F40E15; Tue, 13 Aug 2024 18:00:53 +0200 (CEST) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mails.dpdk.org (Postfix) with ESMTP id B087A40A84 for ; Tue, 13 Aug 2024 18:00:51 +0200 (CEST) Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-2cb576db1c5so3800235a91.1 for ; Tue, 13 Aug 2024 09:00:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1723564851; x=1724169651; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tQxNv6lj4Rb2InV7FsuUQ9V4I3NFyCxd2hOtlNTsRJ4=; b=SvWPCyIekm+EM5XoCsyAb9LP/NqwTjJejqTXC9f3tntYl3mwatwkn5OW6zneOmJVeJ 5srDwiaXOMjgiwHNQr3r/s62cC8UiqwwDcf2YV02191tB39Pux1uXEHIrc1Nen/Knbrt +zhdHvIlUTpu30ZbI/jNJua7TWjUEgUPGJJ4f+6ytHYLWU/wytdLs+81sCjdLAEWdkaF jCDFVRd2N54rsWeaiNrJyTmboK2XY62CzOcvkNLEHiqOalJzW+fTQPsUpaYTYRsL/Uu0 x8zQ+6Q00SPsaiEX5nTPlnnEnY9LCMALwsN9pPHighiat2dluuCdDPmPQZz+jn0AIV0m L/IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723564851; x=1724169651; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tQxNv6lj4Rb2InV7FsuUQ9V4I3NFyCxd2hOtlNTsRJ4=; b=b2HD/5MFd7sTrkhKTzHgziq4Y8FYhvoK7mBuzRBqnXjwabaQnl02oQ1yiIt7+O7bQz +DKYJl4CGDlB9ML9QEjU5q+8jBz7VoPvX6J7D/PHSStTU/vuI/ZBiBEhqybFavpNi63G 0RJTmnKoAAnsHMCYVQGvAKV8LT31yeMWqsD03G9MHUj1jVfG70sSTDdM26eWd+uqlewQ 4VJg7uwnoLXN8IUpEu+ux0lslrnD7Gjfr/C8g2yiqYtS0+e/eDp1fVpEbdyCvlsfqa4z NlWJUIkzjBqTE1Tq+T6wpzK21fDK1IvXTgyxmU+WBpTRjDqVi+5wHi3QRBvI3zkXqC/5 rgqw== X-Gm-Message-State: AOJu0Yz8tjfqcTIOwD7V+AuBWNDGCKcQIz0uGfGUM2X8rNP68tAJOViW 24AednrfgzE1g4Z343yPIkKdwC+WzBqSmq29rVIz9kAY+u8EY5BdDCqbbd8vAqRciXld1uPfBV5 pEYk= X-Google-Smtp-Source: AGHT+IHOlhbGDtjvmw8xZWaG6IZhgjDIND4f7R5dzpXnWP5y8n2hFRqXTkRLdq7lsi9+wmM+Lh+ebQ== X-Received: by 2002:a17:90a:9a5:b0:2c9:8105:483 with SMTP id 98e67ed59e1d1-2d392501f4dmr4577283a91.14.1723564850744; Tue, 13 Aug 2024 09:00:50 -0700 (PDT) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d1fcfe487esm7482612a91.42.2024.08.13.09.00.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 09:00:50 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Bruce Richardson Subject: [PATCH v6 1/4] buildtools: add helper to convert text file to header Date: Tue, 13 Aug 2024 08:57:52 -0700 Message-ID: <20240813160039.5861-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160039.5861-1-stephen@networkplumber.org> References: <20240730225520.83314-1-stephen@networkplumber.org> <20240813160039.5861-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Simple script to read a file and make it into a initialized C string in a header file. Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson --- buildtools/gen-header.py | 36 ++++++++++++++++++++++++++++++++++++ buildtools/meson.build | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 buildtools/gen-header.py diff --git a/buildtools/gen-header.py b/buildtools/gen-header.py new file mode 100644 index 0000000000..06e645863c --- /dev/null +++ b/buildtools/gen-header.py @@ -0,0 +1,36 @@ +#! /usr/bin/env python3 +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (c) 2023 Stephen Hemminger + +""" +Script to read a text file and convert it into a header file. +""" +import sys +import os + + +def main(): + '''program main function''' + print(f'/* File autogenerated by {sys.argv[0]} */') + for path in sys.argv[1:]: + name = os.path.basename(path) + print() + print(f'/* generated from {name} */') + with open(path, "r") as f: + array = name.replace(".", "_") + print(f'static const char {array}[] = ' + '{') + line = f.readline() + + # make sure empty string is null terminated + if not line: + print(' ""') + + while line: + s = repr(line) + print(' {}'.format(s.replace("'", '"'))) + line = f.readline() + print('};') + + +if __name__ == "__main__": + main() diff --git a/buildtools/meson.build b/buildtools/meson.build index 3adf34e1a8..bc818a71d5 100644 --- a/buildtools/meson.build +++ b/buildtools/meson.build @@ -24,6 +24,7 @@ get_numa_count_cmd = py3 + files('get-numa-count.py') get_test_suites_cmd = py3 + files('get-test-suites.py') has_hugepages_cmd = py3 + files('has-hugepages.py') cmdline_gen_cmd = py3 + files('dpdk-cmdline-gen.py') +header_gen_cmd = py3 + files('gen-header.py') # install any build tools that end-users might want also install_data([ @@ -48,4 +49,3 @@ else pmdinfo += 'ar' pmdinfogen += 'elf' endif - From patchwork Tue Aug 13 15:57:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 143116 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 52073457B3; Tue, 13 Aug 2024 18:01:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 54D0540E44; Tue, 13 Aug 2024 18:00:57 +0200 (CEST) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mails.dpdk.org (Postfix) with ESMTP id 23DA540E21 for ; Tue, 13 Aug 2024 18:00:54 +0200 (CEST) Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-2d396fde759so681624a91.3 for ; Tue, 13 Aug 2024 09:00:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1723564853; x=1724169653; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nnc/wU5O7LB9VHFiHu3VjkjZTqiXfO43xz4g+/xJsOI=; b=rtnj+OEh2ciwqNyrsLog2mwSYCGS0PO7H+jPb9yXQL6nt4rAevkO/XyTpA0Tu3OSUd EKPm/eSIjlTfOuuWvXrPUZ5JfERhdxuY1vGhn1rlTEAtrYrXZ4DCc4kBfHB8iS+q9TLj VzcijZU3i2MRdG6Y10hY2KufkMWWO1cfp4HfKR4ZPOfWGXB+o42Wg6tK7bL++DKEhiZF 7Qqc+knE13R9sQsywxwbq9ke4QK2rdGpnwo0aTIKIxHxAsiYak46UySHaB2s7Xq+5gv+ Yt8FxcozLb8W4G2RizBMJGH60Cow7H5J5a7zZNB1Rmxs37Bq5BJrYnoMdWC5s8aesvzy KRmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723564853; x=1724169653; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nnc/wU5O7LB9VHFiHu3VjkjZTqiXfO43xz4g+/xJsOI=; b=ZpS1j6HE2l0NyMOorTQN1Ukxm0aiZcOBq31wbvXeSn34CI5qzp3ZH8h4Qq1lIj/d9y XvE9La//9hVd22/66KT2mQMeIKybqSfg2B1HkzvKYYMad73hgrCAcdsVsEnwgL0i54Zy zeozsBcQOU+26VFZsSxUmqGyjqcgNKA6uifQl2OawnMPfU19jaD3BCE93Ch5GfrHv0+z BO8Ryt1AcVI2BRZpUQya4skavZaeNSJ7bhSj//QiQZ3grwsxfUow81cFKS/EU2wMXTyn fFSg+eFfprVBha9Qf3v32JR9nZjVdqdSGMrB6uxd423G5bSwW48WbAqNVvw88Rfb+wRv B44A== X-Gm-Message-State: AOJu0YyLYDvyr2PFyTmD4npeZskphezXqVKi2WJCgVl+jNRE/UoyT4FH iYIXPczVNIPJRLh72f0L31Sj1VHV0fDFK/STvp/Ba9ArHsnm6MHfD69bFjfaswA1xdCJ+FDXfZC E2A4= X-Google-Smtp-Source: AGHT+IHsnv8Ekg+PFAvscMXHRe0XiPc7AuZUc/h9A21yP112lsAGaIEHXIlh7D0uU3InbgNvIGhIHQ== X-Received: by 2002:a17:90b:895:b0:2c9:8b33:3197 with SMTP id 98e67ed59e1d1-2d39250e0b2mr4413428a91.10.1723564851560; Tue, 13 Aug 2024 09:00:51 -0700 (PDT) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d1fcfe487esm7482612a91.42.2024.08.13.09.00.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 09:00:51 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Bruce Richardson Subject: [PATCH v6 2/4] test: remove unused resource API Date: Tue, 13 Aug 2024 08:57:53 -0700 Message-ID: <20240813160039.5861-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160039.5861-1-stephen@networkplumber.org> References: <20240730225520.83314-1-stephen@networkplumber.org> <20240813160039.5861-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This API was used only for cfgfile tests and was never built after the conversion to meson. Will be replaced by simpler method of doing cfgfile tests. Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson --- app/test/meson.build | 2 - app/test/resource.c | 276 --------------------------------------- app/test/resource.h | 106 --------------- app/test/test_resource.c | 104 --------------- 4 files changed, 488 deletions(-) delete mode 100644 app/test/resource.c delete mode 100644 app/test/resource.h delete mode 100644 app/test/test_resource.c diff --git a/app/test/meson.build b/app/test/meson.build index e29258e6ec..62478c0bb6 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -20,7 +20,6 @@ test_cryptodev_deps = ['bus_vdev', 'net', 'cryptodev', 'security'] source_file_deps = { # The C files providing functionality to other test cases 'packet_burst_generator.c': packet_burst_generator_deps, -# 'resource.c': [], # unused currently. 'sample_packet_forward.c': sample_packet_forward_deps, 'virtual_pmd.c': virtual_pmd_deps, @@ -154,7 +153,6 @@ source_file_deps = { 'test_reciprocal_division_perf.c': [], 'test_red.c': ['sched'], 'test_reorder.c': ['reorder'], -# 'test_resource.c': [], 'test_rib.c': ['net', 'rib'], 'test_rib6.c': ['net', 'rib'], 'test_ring.c': ['ptr_compress'], diff --git a/app/test/resource.c b/app/test/resource.c deleted file mode 100644 index 34465f1668..0000000000 --- a/app/test/resource.c +++ /dev/null @@ -1,276 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2016 RehiveTech. All rights reserved. - */ - -#include -#include -#include -#include - -#include - -#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; -} - -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; -} - -#ifdef RTE_APP_TEST_RESOURCE_TAR -#include -#include - -static int do_copy(struct archive *r, struct archive *w) -{ - const void *buf; - size_t len; -#if ARCHIVE_VERSION_NUMBER >= 3000000 - int64_t off; -#else - off_t off; -#endif - int ret; - - while (1) { - ret = archive_read_data_block(r, &buf, &len, &off); - if (ret == ARCHIVE_RETRY) - continue; - - if (ret == ARCHIVE_EOF) - return 0; - - if (ret != ARCHIVE_OK) - return ret; - - do { - ret = archive_write_data_block(w, buf, len, off); - if (ret != ARCHIVE_OK && ret != ARCHIVE_RETRY) - return ret; - } while (ret != ARCHIVE_OK); - } -} - -int resource_untar(const struct resource *res) -{ - struct archive *r; - struct archive *w; - struct archive_entry *e; - void *p; - int flags = 0; - int ret; - - p = malloc(resource_size(res)); - if (p == NULL) - rte_panic("Failed to malloc %zu B\n", resource_size(res)); - - memcpy(p, res->begin, resource_size(res)); - - r = archive_read_new(); - if (r == NULL) { - free(p); - return -1; - } - - archive_read_support_format_all(r); - archive_read_support_filter_all(r); - - w = archive_write_disk_new(); - if (w == NULL) { - archive_read_free(r); - free(p); - return -1; - } - - flags |= ARCHIVE_EXTRACT_PERM; - flags |= ARCHIVE_EXTRACT_FFLAGS; - archive_write_disk_set_options(w, flags); - archive_write_disk_set_standard_lookup(w); - - ret = archive_read_open_memory(r, p, resource_size(res)); - if (ret != ARCHIVE_OK) - goto fail; - - while (1) { - ret = archive_read_next_header(r, &e); - if (ret == ARCHIVE_EOF) - break; - if (ret != ARCHIVE_OK) - goto fail; - - ret = archive_write_header(w, e); - if (ret == ARCHIVE_EOF) - break; - if (ret != ARCHIVE_OK) - goto fail; - - if (archive_entry_size(e) == 0) - continue; - - ret = do_copy(r, w); - if (ret != ARCHIVE_OK) - goto fail; - - ret = archive_write_finish_entry(w); - if (ret != ARCHIVE_OK) - goto fail; - } - - archive_write_free(w); - archive_read_free(r); - free(p); - return 0; - -fail: - archive_write_free(w); - archive_read_free(r); - free(p); - rte_panic("Failed: %s\n", archive_error_string(r)); - return -1; -} - -int resource_rm_by_tar(const struct resource *res) -{ - struct archive *r; - struct archive_entry *e; - void *p; - int try_again = 1; - int attempts = 0; - int ret; - - p = malloc(resource_size(res)); - if (p == NULL) - rte_panic("Failed to malloc %zu B\n", resource_size(res)); - - memcpy(p, res->begin, resource_size(res)); - - /* - * If somebody creates a file somewhere inside the extracted TAR - * hierarchy during a test the resource_rm_by_tar might loop - * infinitely. We prevent this by adding the attempts counter there. - * In normal case, max N iteration is done where N is the depth of - * the file-hierarchy. - */ - while (try_again && attempts < 10000) { - r = archive_read_new(); - if (r == NULL) { - free(p); - return -1; - } - - archive_read_support_format_all(r); - archive_read_support_filter_all(r); - - ret = archive_read_open_memory(r, p, resource_size(res)); - if (ret != ARCHIVE_OK) { - fprintf(stderr, "Failed: %s\n", - archive_error_string(r)); - goto fail; - } - - try_again = 0; - - while (1) { - ret = archive_read_next_header(r, &e); - if (ret == ARCHIVE_EOF) - break; - if (ret != ARCHIVE_OK) - goto fail; - - ret = remove(archive_entry_pathname(e)); - if (ret < 0) { - switch (errno) { - case ENOTEMPTY: - case EEXIST: - try_again = 1; - break; - - /* should not usually happen: */ - case ENOENT: - case ENOTDIR: - case EROFS: - attempts += 1; - continue; - default: - perror("Failed to remove file"); - goto fail; - } - } - } - - archive_read_free(r); - attempts += 1; - } - - if (attempts >= 10000) { - fprintf(stderr, "Failed to remove archive\n"); - free(p); - return -1; - } - - free(p); - return 0; - -fail: - archive_read_free(r); - free(p); - - rte_panic("Failed: %s\n", archive_error_string(r)); - return -1; -} - -#endif /* RTE_APP_TEST_RESOURCE_TAR */ - -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 deleted file mode 100644 index c75ebd4b5d..0000000000 --- a/app/test/resource.h +++ /dev/null @@ -1,106 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2016 RehiveTech. All rights reserved. - */ - -#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 -#include -#include - -#include -#include - -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); - -/** - * 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); - -/** - * Treat the given resource as a tar archive. Extract - * the archive to the current directory. - */ -int resource_untar(const struct resource *res); - -/** - * Treat the given resource as a tar archive. Remove - * all files (related to the current directory) listed - * in the tar archive. - */ -int resource_rm_by_tar(const struct resource *res); - -/** - * 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 linked externally (by means of the used toolchain). - * Only the base name of the resource is expected. The name refers to the - * linked pointers beg_ and end_ provided externally. - */ -#define REGISTER_LINKED_RESOURCE(n) \ -extern const char beg_ ##n; \ -extern const char end_ ##n; \ -REGISTER_RESOURCE(n, &beg_ ##n, &end_ ##n) \ - -/** - * 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, \ -}; \ -RTE_INIT(resinitfn_ ##n) \ -{ \ - resource_register(&linkres_ ##n); \ -} - -#endif diff --git a/app/test/test_resource.c b/app/test/test_resource.c deleted file mode 100644 index 05c27db203..0000000000 --- a/app/test/test_resource.c +++ /dev/null @@ -1,104 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2016 RehiveTech. All rights reserved. - */ - -#include -#include - -#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; -} - -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"); - TEST_ASSERT(!strcmp(r->name, "test_resource_c"), - "Found resource %s, expected test_resource_c", - r->name); - - TEST_ASSERT_SUCCESS(resource_fwrite_file(r, "test_resource.c"), - "Failed 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; -} - -#ifdef RTE_APP_TEST_RESOURCE_TAR -REGISTER_LINKED_RESOURCE(test_resource_tar); - -static int test_resource_tar(void) -{ - const struct resource *r; - FILE *f; - - r = resource_find("test_resource_tar"); - TEST_ASSERT_NOT_NULL(r, "No test_resource_tar found"); - TEST_ASSERT(!strcmp(r->name, "test_resource_tar"), - "Found resource %s, expected test_resource_tar", - r->name); - - TEST_ASSERT_SUCCESS(resource_untar(r), - "Failed to to untar %s", r->name); - - f = fopen("test_resource.c", "r"); - TEST_ASSERT_NOT_NULL(f, - "Missing extracted file test_resource.c"); - fclose(f); - - TEST_ASSERT_SUCCESS(resource_rm_by_tar(r), - "Failed to remove extracted contents of %s", r->name); - return 0; -} - -#endif /* RTE_APP_TEST_RESOURCE_TAR */ - -static int test_resource(void) -{ - if (test_resource_dpdk()) - return -1; - - if (test_resource_c()) - return -1; - -#ifdef RTE_APP_TEST_RESOURCE_TAR - if (test_resource_tar()) - return -1; -#endif /* RTE_APP_TEST_RESOURCE_TAR */ - - return 0; -} - -REGISTER_TEST_COMMAND(resource_autotest, test_resource); From patchwork Tue Aug 13 15:57:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 143115 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EDC2A457B3; Tue, 13 Aug 2024 18:01:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 18CD840E41; Tue, 13 Aug 2024 18:00:55 +0200 (CEST) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mails.dpdk.org (Postfix) with ESMTP id 86A794065B for ; Tue, 13 Aug 2024 18:00:53 +0200 (CEST) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-7afd1aeac83so8384a12.0 for ; Tue, 13 Aug 2024 09:00:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1723564852; x=1724169652; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=v2JlgF2VaP05c51c0NRtGxuQLMunaYWKxJn722NLRYw=; b=KqWoOrclT7X72Q36g6Iju63lrcZ4+RJ4ipLE4h7WofaHdoi9Ph9CGiYXb1+E7/mzmk XIY/lL1MJ/Xx583pTHj4JTe9syeeBtwqKh7ICXrMrz9HpyRWTivRTHiksRM/jXXxE/F7 u14K4cWT3UptK1NTAn2NO75PcSBIW+spHmO0OvKMXA2ra3NksrwABh4ccpLO3UwE4+6v pzvnhyBjhsGpeYLJ6e2XUiK29+ysFpRaneNWfB7jaJd7ZYeH5dGofeP368KBmXxVgsIg DeK83tFmBFHiC7AJNmPVmccPqM59zAAFu8yzFlxnW+CSHKvEptDI91Y1ZiyIIzbx/Ta+ 3tPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723564852; x=1724169652; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v2JlgF2VaP05c51c0NRtGxuQLMunaYWKxJn722NLRYw=; b=VM9gZUBaC0GbXV2WKRVzX9l4vGkoh7dOH2TTXXse4cnm+sChshgzjxAC9R6Y8W5ckS 2GMPXxLkWFDzDjO2CWp3GtReVHyj3Mr6eMoz+aUPCFcfQYwhS7zo027iUK1PHMhXUKmx ft/SbfGm1lot+QW6cgmxeKr11EfhSzXp3MICx2VQvuus0rXkBBCQMR6+7uiCPQZS2+FI /WHm5nykxT/xEssjw3SRuj4iT8uddmvIkVl8O7mGO2fExCtBwYrA+M/1zH8hjvkYWEH4 8YcdZ1Izs+Avz99D+fUFr8k0/cgv4+0r7daoG5+nfpn5syQLCGkV4Jiw0Bs52hiRfumt Ne4g== X-Gm-Message-State: AOJu0Yz6rB7PDKZ+Y5n077JfKrYAPQZAJhElVZKBxx/8L0SoE3yKY6+7 sCj0h2Zz7qPGVUDY/L64Z1ZWEMjwCbwSCUQnC4JqwnmslUYTNIl6BWRlUGC7Nxxm9hI1Q7bcCog Itms= X-Google-Smtp-Source: AGHT+IEGCl3DYLQHjk5aNI5HjYgy7r+nhN6WgcapQks1FEJq4TTVHrGqSl4DpIuWVY95uPAbwphPsg== X-Received: by 2002:a17:90a:62c9:b0:2c3:2f5a:17d4 with SMTP id 98e67ed59e1d1-2d3a9e538a3mr240402a91.4.1723564852472; Tue, 13 Aug 2024 09:00:52 -0700 (PDT) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d1fcfe487esm7482612a91.42.2024.08.13.09.00.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 09:00:52 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Bruce Richardson , Cristian Dumitrescu Subject: [PATCH v6 3/4] test: rearrange test_cfgfiles cases Date: Tue, 13 Aug 2024 08:57:54 -0700 Message-ID: <20240813160039.5861-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160039.5861-1-stephen@networkplumber.org> References: <20240730225520.83314-1-stephen@networkplumber.org> <20240813160039.5861-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The input files don't need to be in a separate subdirectory. Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson --- app/test/test_cfgfiles/{etc => }/empty.ini | 0 app/test/test_cfgfiles/{etc => }/empty_key_value.ini | 0 app/test/test_cfgfiles/{etc => }/invalid_section.ini | 0 app/test/test_cfgfiles/{etc => }/line_too_long.ini | 0 app/test/test_cfgfiles/{etc => }/missing_section.ini | 0 app/test/test_cfgfiles/{etc => }/realloc_sections.ini | 0 app/test/test_cfgfiles/{etc => }/sample1.ini | 0 app/test/test_cfgfiles/{etc => }/sample2.ini | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename app/test/test_cfgfiles/{etc => }/empty.ini (100%) rename app/test/test_cfgfiles/{etc => }/empty_key_value.ini (100%) rename app/test/test_cfgfiles/{etc => }/invalid_section.ini (100%) rename app/test/test_cfgfiles/{etc => }/line_too_long.ini (100%) rename app/test/test_cfgfiles/{etc => }/missing_section.ini (100%) rename app/test/test_cfgfiles/{etc => }/realloc_sections.ini (100%) rename app/test/test_cfgfiles/{etc => }/sample1.ini (100%) rename app/test/test_cfgfiles/{etc => }/sample2.ini (100%) diff --git a/app/test/test_cfgfiles/etc/empty.ini b/app/test/test_cfgfiles/empty.ini similarity index 100% rename from app/test/test_cfgfiles/etc/empty.ini rename to app/test/test_cfgfiles/empty.ini diff --git a/app/test/test_cfgfiles/etc/empty_key_value.ini b/app/test/test_cfgfiles/empty_key_value.ini similarity index 100% rename from app/test/test_cfgfiles/etc/empty_key_value.ini rename to app/test/test_cfgfiles/empty_key_value.ini diff --git a/app/test/test_cfgfiles/etc/invalid_section.ini b/app/test/test_cfgfiles/invalid_section.ini similarity index 100% rename from app/test/test_cfgfiles/etc/invalid_section.ini rename to app/test/test_cfgfiles/invalid_section.ini diff --git a/app/test/test_cfgfiles/etc/line_too_long.ini b/app/test/test_cfgfiles/line_too_long.ini similarity index 100% rename from app/test/test_cfgfiles/etc/line_too_long.ini rename to app/test/test_cfgfiles/line_too_long.ini diff --git a/app/test/test_cfgfiles/etc/missing_section.ini b/app/test/test_cfgfiles/missing_section.ini similarity index 100% rename from app/test/test_cfgfiles/etc/missing_section.ini rename to app/test/test_cfgfiles/missing_section.ini diff --git a/app/test/test_cfgfiles/etc/realloc_sections.ini b/app/test/test_cfgfiles/realloc_sections.ini similarity index 100% rename from app/test/test_cfgfiles/etc/realloc_sections.ini rename to app/test/test_cfgfiles/realloc_sections.ini diff --git a/app/test/test_cfgfiles/etc/sample1.ini b/app/test/test_cfgfiles/sample1.ini similarity index 100% rename from app/test/test_cfgfiles/etc/sample1.ini rename to app/test/test_cfgfiles/sample1.ini diff --git a/app/test/test_cfgfiles/etc/sample2.ini b/app/test/test_cfgfiles/sample2.ini similarity index 100% rename from app/test/test_cfgfiles/etc/sample2.ini rename to app/test/test_cfgfiles/sample2.ini From patchwork Tue Aug 13 15:57:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 143117 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0B1A5457B3; Tue, 13 Aug 2024 18:01:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8D22140E64; Tue, 13 Aug 2024 18:00:58 +0200 (CEST) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mails.dpdk.org (Postfix) with ESMTP id 766F740E2B for ; Tue, 13 Aug 2024 18:00:54 +0200 (CEST) Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-2cf213128a1so3792264a91.2 for ; Tue, 13 Aug 2024 09:00:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1723564853; x=1724169653; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mWi8RPbpbOR8pS1/K/fbEHgA9x94e+BFs1LtR8NiWDg=; b=XgnpRGKmo/m/KxxLkAnfwe2zaM6+LB23QARdb5KucHmHyrxXVX+R/KtUK8A4DLafxQ HETl+8sL4IvWtIfvn1F+4MTulxPmaRw/xf/cRgy2bDf94fTmBLi0JQMGJ48W5DzgMKwf BgBmIb7rZ4ic94yicB6QiuEvy3F1mdodD9KWyoSwNRzGQK6howBFKQrkNeV5gBJR3ri2 i3X80YS5s42zLEC7kJDWZQIdgxNe50XYMYShAuNFQFqANN0Y9th+gph4hzaPQQ53kW7m hqRwf1yM9wDRoa5ig31dvnqmsZ0jFY2Qqsbj8llIFWrWQzor1u9/hWNs9xA2yD4Sxj2z Y4mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723564853; x=1724169653; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mWi8RPbpbOR8pS1/K/fbEHgA9x94e+BFs1LtR8NiWDg=; b=lmIdNttgquNFBPPaUFMCL6AqxGrKFpOp/2DcCuraQccPDegeLDywc7dMffSrMPZLux vqtoj6RdMsJMV3ViRoQ4lnTgwWQSo7U2E4pmIVQft/t/aPZ4teixYE6qbFhq7NGyqiaO nbWrx5xIxqBbXDSDD83tFcje0qWXGp/L+/jadq1OD7fAaJSdDXhWy54J2Rle8ZH8Jt3+ auOoYN+zb5yKivsLwQ/WE6eZXUIcsV64zogqHcB4ZYk0fOoiEusIskFcMke2Uch0phrQ S6LEbuQe8r5/gEBndLQKIiOCGGZMZWE4uUR3TgBog1UOhWcn7nZV5q2IfPWjUPJDwv3Z jaiQ== X-Gm-Message-State: AOJu0YwppSJ0uQ7n/PbWkGJOz4UJyujxoRA8JyX3e+Yu8ftVvYACFXIz m91ZTFXv7Ux4mLmU7oMINb0wgalZEDPP7cqA5xNISDPqmZz6jQo6OQbmQJk3qj+LGoZ3zZswi9f Dql0= X-Google-Smtp-Source: AGHT+IGJNwBYETg+TCOpLtkw0APjB6qY+Wc4T07q/bdCBqVUGwjbvS7KCM5A/PrthHBG94mfmXCmYw== X-Received: by 2002:a17:90a:7448:b0:2d1:b49d:7f2 with SMTP id 98e67ed59e1d1-2d392548219mr4627639a91.22.1723564853341; Tue, 13 Aug 2024 09:00:53 -0700 (PDT) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d1fcfe487esm7482612a91.42.2024.08.13.09.00.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 09:00:52 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Bruce Richardson , Cristian Dumitrescu Subject: [PATCH v6 4/4] test: restore cfgfile tests Date: Tue, 13 Aug 2024 08:57:55 -0700 Message-ID: <20240813160039.5861-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813160039.5861-1-stephen@networkplumber.org> References: <20240730225520.83314-1-stephen@networkplumber.org> <20240813160039.5861-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org These tests were not built since the conversion to meson. Instead of using embedded resource functions, put data in include file and generate temporary file before the test. The changes to app/test/meson.build are to handle auto-generated files (resources) differently. Don't scan these files to look for test input. Using common unit test macro allows for simpler management of more tests. Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson --- app/meson.build | 3 +- app/test/meson.build | 6 +- app/test/test_cfgfile.c | 213 ++++++++++++++++++----------- app/test/test_cfgfiles/meson.build | 19 +++ 4 files changed, 157 insertions(+), 84 deletions(-) create mode 100644 app/test/test_cfgfiles/meson.build diff --git a/app/meson.build b/app/meson.build index 5b2c80c7a1..e2db888ae1 100644 --- a/app/meson.build +++ b/app/meson.build @@ -55,6 +55,7 @@ foreach app:apps build = true reason = '' # set if build == false to explain sources = [] + resources = [] includes = [] cflags = default_cflags ldflags = default_ldflags @@ -115,7 +116,7 @@ foreach app:apps endif exec = executable('dpdk-' + name, - sources, + [ sources, resources ], c_args: cflags, link_args: ldflags, link_whole: link_libs, diff --git a/app/test/meson.build b/app/test/meson.build index 62478c0bb6..b2bb7c36f6 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -35,7 +35,7 @@ source_file_deps = { 'test_bitratestats.c': ['metrics', 'bitratestats', 'ethdev'] + sample_packet_forward_deps, 'test_bpf.c': ['bpf', 'net'], 'test_byteorder.c': [], -# 'test_cfgfile.c': ['cfgfile'], + 'test_cfgfile.c': ['cfgfile'], 'test_cksum.c': ['net'], 'test_cksum_perf.c': ['net'], 'test_cmdline.c': [], @@ -261,3 +261,7 @@ if not is_windows build_by_default: true, install: false) endif + +subdir('test_cfgfiles') + +resources += test_cfgfile_h diff --git a/app/test/test_cfgfile.c b/app/test/test_cfgfile.c index a5e3d8699c..8146435033 100644 --- a/app/test/test_cfgfile.c +++ b/app/test/test_cfgfile.c @@ -5,48 +5,54 @@ #include #include #include -#include +#include + +#ifdef RTE_EXEC_ENV_WINDOWS +#include +#endif #include #include "test.h" -#include "resource.h" - -#define CFG_FILES_ETC "test_cfgfiles/etc" - -REGISTER_LINKED_RESOURCE(test_cfgfiles); +#include "test_cfgfiles.h" static int -test_cfgfile_setup(void) +make_tmp_file(char *filename, const char *prefix, const char *data) { - const struct resource *r; - int ret; + size_t len = strlen(data); + size_t count; + FILE *f; - r = resource_find("test_cfgfiles"); - TEST_ASSERT_NOT_NULL(r, "missing resource test_cfgfiles"); +#ifdef RTE_EXEC_ENV_WINDOWS + char tempDirName[MAX_PATH - 14]; - ret = resource_untar(r); - TEST_ASSERT_SUCCESS(ret, "failed to untar %s", r->name); + if (GetTempPathA(sizeof(tempDirName), tempDirName) == 0) + return -1; - return 0; -} + if (GetTempFileNameA(tempDirName, prefix, 0, filename) == 0) + return -1; -static int -test_cfgfile_cleanup(void) -{ - const struct resource *r; - int ret; + f = fopen(filename, "wt"); +#else + snprintf(filename, PATH_MAX, "/tmp/%s_XXXXXXX", prefix); - r = resource_find("test_cfgfiles"); - TEST_ASSERT_NOT_NULL(r, "missing resource test_cfgfiles"); + int fd = mkstemp(filename); + if (fd < 0) + return -1; - ret = resource_rm_by_tar(r); - TEST_ASSERT_SUCCESS(ret, "Failed to delete resource %s", r->name); + f = fdopen(fd, "w"); +#endif + if (f == NULL) + return -1; - return 0; + count = fwrite(data, sizeof(char), len, f); + fclose(f); + + return (count == len) ? 0 : -1; } + static int _test_cfgfile_sample(struct rte_cfgfile *cfgfile) { @@ -87,9 +93,13 @@ static int test_cfgfile_sample1(void) { struct rte_cfgfile *cfgfile; + char filename[PATH_MAX]; int ret; - cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/sample1.ini", 0); + ret = make_tmp_file(filename, "sample1", sample1_ini); + TEST_ASSERT_SUCCESS(ret, "Failed to setup temp file"); + + cfgfile = rte_cfgfile_load(filename, 0); TEST_ASSERT_NOT_NULL(cfgfile, "Failed to load config file"); ret = _test_cfgfile_sample(cfgfile); @@ -98,6 +108,8 @@ test_cfgfile_sample1(void) ret = rte_cfgfile_close(cfgfile); TEST_ASSERT_SUCCESS(ret, "Failed to close cfgfile"); + remove(filename); + return 0; } @@ -106,15 +118,18 @@ test_cfgfile_sample2(void) { struct rte_cfgfile_parameters params; struct rte_cfgfile *cfgfile; + char filename[PATH_MAX]; int ret; + ret = make_tmp_file(filename, "sample2", sample2_ini); + TEST_ASSERT_SUCCESS(ret, "Failed to setup temp file"); + /* override comment character */ memset(¶ms, 0, sizeof(params)); params.comment_character = '#'; - cfgfile = rte_cfgfile_load_with_params(CFG_FILES_ETC "/sample2.ini", 0, - ¶ms); - TEST_ASSERT_NOT_NULL(cfgfile, "Failed to parse sample2.ini"); + cfgfile = rte_cfgfile_load_with_params(filename, 0, ¶ms); + TEST_ASSERT_NOT_NULL(cfgfile, "Failed to parse sample2"); ret = _test_cfgfile_sample(cfgfile); TEST_ASSERT_SUCCESS(ret, "Failed to validate sample file: %d", ret); @@ -122,6 +137,8 @@ test_cfgfile_sample2(void) ret = rte_cfgfile_close(cfgfile); TEST_ASSERT_SUCCESS(ret, "Failed to close cfgfile"); + remove(filename); + return 0; } @@ -129,10 +146,14 @@ static int test_cfgfile_realloc_sections(void) { struct rte_cfgfile *cfgfile; + char filename[PATH_MAX]; int ret; const char *value; - cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/realloc_sections.ini", 0); + ret = make_tmp_file(filename, "realloc", realloc_sections_ini); + TEST_ASSERT_SUCCESS(ret, "Failed to setup temp file"); + + cfgfile = rte_cfgfile_load(filename, 0); TEST_ASSERT_NOT_NULL(cfgfile, "Failed to load config file"); ret = rte_cfgfile_num_sections(cfgfile, NULL, 0); @@ -152,9 +173,18 @@ test_cfgfile_realloc_sections(void) TEST_ASSERT(strcmp("value8_section9", value) == 0, "key unexpected value: %s", value); - ret = rte_cfgfile_save(cfgfile, "/tmp/cfgfile_save.ini"); - TEST_ASSERT_SUCCESS(ret, "Failed to save *.ini file"); - remove("/tmp/cfgfile_save.ini"); + remove(filename); + + char tmp[PATH_MAX] = "/tmp/"; +#ifdef RTE_EXEC_ENV_WINDOWS + ret = GetTempPathA(sizeof(tmp), tmp); + TEST_ASSERT(ret > 0, "Failed to get tmp directory"); +#endif + snprintf(filename, sizeof(filename), "%s%s", tmp, "cfg_save.ini"); + + ret = rte_cfgfile_save(cfgfile, filename); + TEST_ASSERT_SUCCESS(ret, "Failed to save to %s", filename); + remove(filename); ret = rte_cfgfile_close(cfgfile); TEST_ASSERT_SUCCESS(ret, "Failed to close cfgfile"); @@ -166,10 +196,16 @@ static int test_cfgfile_invalid_section_header(void) { struct rte_cfgfile *cfgfile; + char filename[PATH_MAX]; + int ret; + + ret = make_tmp_file(filename, "invalid", invalid_section_ini); + TEST_ASSERT_SUCCESS(ret, "Failed to setup temp file"); - cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/invalid_section.ini", 0); + cfgfile = rte_cfgfile_load(filename, 0); TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur"); + remove(filename); return 0; } @@ -178,15 +214,20 @@ test_cfgfile_invalid_comment(void) { struct rte_cfgfile_parameters params; struct rte_cfgfile *cfgfile; + char filename[PATH_MAX]; + int ret; /* override comment character with an invalid one */ memset(¶ms, 0, sizeof(params)); params.comment_character = '$'; - cfgfile = rte_cfgfile_load_with_params(CFG_FILES_ETC "/sample2.ini", 0, - ¶ms); + ret = make_tmp_file(filename, "sample2", sample2_ini); + TEST_ASSERT_SUCCESS(ret, "Failed to setup temp file"); + + cfgfile = rte_cfgfile_load_with_params(filename, 0, ¶ms); TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur"); + remove(filename); return 0; } @@ -194,10 +235,16 @@ static int test_cfgfile_invalid_key_value_pair(void) { struct rte_cfgfile *cfgfile; + char filename[PATH_MAX]; + int ret; + + ret = make_tmp_file(filename, "empty_key", empty_key_value_ini); + TEST_ASSERT_SUCCESS(ret, "Failed to setup temp file"); - cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/empty_key_value.ini", 0); + cfgfile = rte_cfgfile_load(filename, 0); TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur"); + remove(filename); return 0; } @@ -206,11 +253,14 @@ test_cfgfile_empty_key_value_pair(void) { struct rte_cfgfile *cfgfile; const char *value; + char filename[PATH_MAX]; int ret; - cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/empty_key_value.ini", - CFG_FLAG_EMPTY_VALUES); - TEST_ASSERT_NOT_NULL(cfgfile, "Failed to parse empty_key_value.ini"); + ret = make_tmp_file(filename, "empty_key_value", empty_key_value_ini); + TEST_ASSERT_SUCCESS(ret, "Failed to setup temp file"); + + cfgfile = rte_cfgfile_load(filename, CFG_FLAG_EMPTY_VALUES); + TEST_ASSERT_NOT_NULL(cfgfile, "Failed to parse empty_key_value"); ret = rte_cfgfile_num_sections(cfgfile, NULL, 0); TEST_ASSERT(ret == 1, "Unexpected number of sections: %d", ret); @@ -227,6 +277,7 @@ test_cfgfile_empty_key_value_pair(void) ret = rte_cfgfile_close(cfgfile); TEST_ASSERT_SUCCESS(ret, "Failed to close cfgfile"); + remove(filename); return 0; } @@ -234,10 +285,16 @@ static int test_cfgfile_missing_section(void) { struct rte_cfgfile *cfgfile; + char filename[PATH_MAX]; + int ret; + + ret = make_tmp_file(filename, "missing_section", missing_section_ini); + TEST_ASSERT_SUCCESS(ret, "Failed to setup temp file"); - cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/missing_section.ini", 0); + cfgfile = rte_cfgfile_load(filename, 0); TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur"); + remove(filename); return 0; } @@ -246,10 +303,13 @@ test_cfgfile_global_properties(void) { struct rte_cfgfile *cfgfile; const char *value; + char filename[PATH_MAX]; int ret; - cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/missing_section.ini", - CFG_FLAG_GLOBAL_SECTION); + ret = make_tmp_file(filename, "missing_section", missing_section_ini); + TEST_ASSERT_SUCCESS(ret, "Failed to setup temp file"); + + cfgfile = rte_cfgfile_load(filename, CFG_FLAG_GLOBAL_SECTION); TEST_ASSERT_NOT_NULL(cfgfile, "Failed to load config file"); ret = rte_cfgfile_num_sections(cfgfile, NULL, 0); @@ -268,6 +328,7 @@ test_cfgfile_global_properties(void) ret = rte_cfgfile_close(cfgfile); TEST_ASSERT_SUCCESS(ret, "Failed to close cfgfile"); + remove(filename); return 0; } @@ -275,9 +336,13 @@ static int test_cfgfile_empty_file(void) { struct rte_cfgfile *cfgfile; + char filename[PATH_MAX]; int ret; - cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/empty.ini", 0); + ret = make_tmp_file(filename, "empty", empty_ini); + TEST_ASSERT_SUCCESS(ret, "Failed to setup temp file"); + + cfgfile = rte_cfgfile_load(filename, 0); TEST_ASSERT_NOT_NULL(cfgfile, "Failed to load config file"); ret = rte_cfgfile_num_sections(cfgfile, NULL, 0); @@ -286,49 +351,33 @@ test_cfgfile_empty_file(void) ret = rte_cfgfile_close(cfgfile); TEST_ASSERT_SUCCESS(ret, "Failed to close cfgfile"); + remove(filename); return 0; } +static struct +unit_test_suite test_cfgfile_suite = { + .suite_name = "Test Cfgfile Unit Test Suite", + .unit_test_cases = { + TEST_CASE(test_cfgfile_sample1), + TEST_CASE(test_cfgfile_sample2), + TEST_CASE(test_cfgfile_realloc_sections), + TEST_CASE(test_cfgfile_invalid_section_header), + TEST_CASE(test_cfgfile_invalid_comment), + TEST_CASE(test_cfgfile_invalid_key_value_pair), + TEST_CASE(test_cfgfile_empty_key_value_pair), + TEST_CASE(test_cfgfile_missing_section), + TEST_CASE(test_cfgfile_global_properties), + TEST_CASE(test_cfgfile_empty_file), + + TEST_CASES_END() + } +}; + static int test_cfgfile(void) { - if (test_cfgfile_setup()) - return -1; - - if (test_cfgfile_sample1()) - return -1; - - if (test_cfgfile_sample2()) - return -1; - - if (test_cfgfile_realloc_sections()) - return -1; - - if (test_cfgfile_invalid_section_header()) - return -1; - - if (test_cfgfile_invalid_comment()) - return -1; - - if (test_cfgfile_invalid_key_value_pair()) - return -1; - - if (test_cfgfile_empty_key_value_pair()) - return -1; - - if (test_cfgfile_missing_section()) - return -1; - - if (test_cfgfile_global_properties()) - return -1; - - if (test_cfgfile_empty_file()) - return -1; - - if (test_cfgfile_cleanup()) - return -1; - - return 0; + return unit_test_suite_runner(&test_cfgfile_suite); } -REGISTER_TEST_COMMAND(cfgfile_autotest, test_cfgfile); +REGISTER_FAST_TEST(cfgfile_autotest, true, true, test_cfgfile); diff --git a/app/test/test_cfgfiles/meson.build b/app/test/test_cfgfiles/meson.build new file mode 100644 index 0000000000..348c78c7d9 --- /dev/null +++ b/app/test/test_cfgfiles/meson.build @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: BSD-3-Clause + +test_cfgfiles = files( + 'empty.ini', + 'empty_key_value.ini', + 'invalid_section.ini', + 'line_too_long.ini', + 'missing_section.ini', + 'realloc_sections.ini', + 'sample1.ini', + 'sample2.ini', +) + +# generate the header file used in cfgfile test +test_cfgfile_h = custom_target('test_cfgfile', + output: 'test_cfgfiles.h', + input: test_cfgfiles, + capture: true, + command: [ header_gen_cmd, '@INPUT@'])