From patchwork Wed Apr 6 08:32:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1613848 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=T7b3cVXu; dkim=fail reason="signature verification failed" header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=rdeWn7lb; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KYHpt3hdKz9sFq for ; Wed, 6 Apr 2022 18:33:40 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id E71943CA459 for ; Wed, 6 Apr 2022 10:33:36 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [IPv6:2001:4b78:1:20::6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 704143CA109 for ; Wed, 6 Apr 2022 10:33:35 +0200 (CEST) Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-6.smtp.seeweb.it (Postfix) with ESMTPS id 95A711400E52 for ; Wed, 6 Apr 2022 10:33:34 +0200 (CEST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B3084210F4; Wed, 6 Apr 2022 08:32:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1649233976; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=0DLOtfG4YwzF1YPcRz9Gfz4nX2Ovoj4gk462JQYzXmY=; b=T7b3cVXuZClMrdtqR1/fzWyzJz21kYJjxENDlzmhY4KzbYYjkNGyFZluvPLFp7qdyH9f+Q 1kZvIVmsRNDV2TQUU/eNcb6vCxIlrYh7fTzzkFZiUeVZY3X+Ht0F2o8YdimsAhE+Q81BM8 HO5m897GLJ3H5fD11jw/CNsgWsBE+uM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1649233976; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=0DLOtfG4YwzF1YPcRz9Gfz4nX2Ovoj4gk462JQYzXmY=; b=rdeWn7lbyLEoeZ0YHkZWWPAQIMENo6yFX3VbVeX29Urt/ohKFTA0qRSTJfdlmIFjlYcl4R Qp37h9P4oyucdeAQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 7C19C13A8E; Wed, 6 Apr 2022 08:32:56 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id bG4QHDhQTWL6aQAAMHmgww (envelope-from ); Wed, 06 Apr 2022 08:32:56 +0000 From: Petr Vorel To: ltp@lists.linux.it Date: Wed, 6 Apr 2022 10:32:52 +0200 Message-Id: <20220406083252.14130-1-pvorel@suse.cz> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-6.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-6.smtp.seeweb.it Subject: [LTP] [PATCH v2 1/1] confstr01.c: Rewrite into new API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" From: Andrea Cervesato Fix musl build and runtime issues. Signed-off-by: Andrea Cervesato pvorel: fix musl runtime issue, workaround a redefinition issues on musl and glibc ] Co-developed-by: Petr Vorel Signed-off-by: Petr Vorel --- Changes v2->v3: * #ifdef _CS_V7_ENV (uclibc) * if !TST_RET instead of !TST_PASS to catch unimplemented constants testcases/kernel/syscalls/confstr/confstr01.c | 193 ++++++++---------- 1 file changed, 85 insertions(+), 108 deletions(-) diff --git a/testcases/kernel/syscalls/confstr/confstr01.c b/testcases/kernel/syscalls/confstr/confstr01.c index 0fc4c46d51..57ac0a9ad9 100644 --- a/testcases/kernel/syscalls/confstr/confstr01.c +++ b/testcases/kernel/syscalls/confstr/confstr01.c @@ -1,136 +1,113 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * - * Copyright (c) International Business Machines Corp., 2002 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See - * the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Copyright (c) International Business Machines Corp., 2002 +* 11/20/2002 Port to LTP +* 06/30/2001 Port to Linux + * Copyright (C) 2022 SUSE LLC Andrea Cervesato + * Copyright (c) 2022 Petr Vorel */ -/* 11/20/2002 Port to LTP robbiew@us.ibm.com */ -/* 06/30/2001 Port to Linux nsharoff@us.ibm.com */ - -/* - * NAME - * confstr1.c - test for confstr(3C) - Get configuration-defined string - * values. - * - * CALLS - * confstr(3C) - * - * RESTRICTIONS - * MUST RUN AS ROOT +/*\ + * [Description] * + * Test confstr(3) 500 (X/Open 5) functionality – POSIX 1995. */ +#include "tst_test.h" + +#ifdef _XOPEN_SOURCE +# undef _XOPEN_SOURCE +#endif #define _XOPEN_SOURCE 500 +#include #include -#include -#include -#include - -#include "test.h" -#include "safe_macros.h" static struct test_case_t { int value; char *name; } test_cases[] = { - {_CS_PATH, "PATH"}, - {_CS_XBS5_ILP32_OFF32_CFLAGS, "XBS5_ILP32_OFF32_CFLAGS"}, - {_CS_XBS5_ILP32_OFF32_LDFLAGS, "XBS5_ILP32_OFF32_LDFLAGS"}, - {_CS_XBS5_ILP32_OFF32_LIBS, "XBS5_ILP32_OFF32_LIBS"}, - {_CS_XBS5_ILP32_OFF32_LINTFLAGS, "XBS5_ILP32_OFF32_LINTFLAGS"}, - {_CS_XBS5_ILP32_OFFBIG_CFLAGS, "XBS5_ILP32_OFFBIG_CFLAGS"}, - {_CS_XBS5_ILP32_OFFBIG_LDFLAGS, "XBS5_ILP32_OFFBIG_LDFLAGS"}, - {_CS_XBS5_ILP32_OFFBIG_LIBS, "XBS5_ILP32_OFFBIG_LIBS"}, - {_CS_XBS5_ILP32_OFFBIG_LINTFLAGS, "XBS5_ILP32_OFFBIG_LINTFLAGS"}, - {_CS_XBS5_LP64_OFF64_CFLAGS, "XBS5_LP64_OFF64_CFLAGS"}, - {_CS_XBS5_LP64_OFF64_LDFLAGS, "XBS5_LP64_OFF64_LDFLAGS"}, - {_CS_XBS5_LP64_OFF64_LIBS, "XBS5_LP64_OFF64_LIBS"}, - {_CS_XBS5_LP64_OFF64_LINTFLAGS, "XBS5_LP64_OFF64_LINTFLAGS"}, - {_CS_XBS5_LPBIG_OFFBIG_CFLAGS, "XBS5_LPBIG_OFFBIG_CFLAGS"}, - {_CS_XBS5_LPBIG_OFFBIG_LDFLAGS, "XBS5_LPBIG_OFFBIG_LDFLAGS"}, - {_CS_XBS5_LPBIG_OFFBIG_LIBS, "XBS5_LPBIG_OFFBIG_LIBS"}, - {_CS_XBS5_LPBIG_OFFBIG_LINTFLAGS, "XBS5_LPBIG_OFFBIG_LINTFLAGS"}, - {_CS_GNU_LIBC_VERSION, "GNU_LIBC_VERSION"}, - {_CS_GNU_LIBPTHREAD_VERSION, "GNU_LIBPTHREAD_VERSION"}, + { _CS_PATH, "PATH" }, + { _CS_GNU_LIBC_VERSION, "GNU_LIBC_VERSION" }, + { _CS_GNU_LIBPTHREAD_VERSION, "GNU_LIBPTHREAD_VERSION" }, + +/* checking for obsolete configurations */ +#ifdef _CS_XBS5_ILP32_OFF32_CFLAGS + { _CS_XBS5_ILP32_OFF32_CFLAGS, "XBS5_ILP32_OFF32_CFLAGS" }, +#endif +#ifdef _CS_XBS5_ILP32_OFF32_LDFLAGS + { _CS_XBS5_ILP32_OFF32_LDFLAGS, "XBS5_ILP32_OFF32_LDFLAGS" }, +#endif +#ifdef _CS_XBS5_ILP32_OFF32_LIBS + { _CS_XBS5_ILP32_OFF32_LIBS, "XBS5_ILP32_OFF32_LIBS" }, +#endif +#ifdef _CS_XBS5_ILP32_OFF32_LINTFLAGS + { _CS_XBS5_ILP32_OFF32_LINTFLAGS, "XBS5_ILP32_OFF32_LINTFLAGS" }, +#endif +#ifdef _CS_XBS5_ILP32_OFFBIG_CFLAGS + { _CS_XBS5_ILP32_OFFBIG_CFLAGS, "XBS5_ILP32_OFFBIG_CFLAGS" }, +#endif +#ifdef _CS_XBS5_ILP32_OFFBIG_LDFLAGS + { _CS_XBS5_ILP32_OFFBIG_LDFLAGS, "XBS5_ILP32_OFFBIG_LDFLAGS" }, +#endif +#ifdef _CS_XBS5_ILP32_OFFBIG_LIBS + { _CS_XBS5_ILP32_OFFBIG_LIBS, "XBS5_ILP32_OFFBIG_LIBS" }, +#endif +#ifdef _CS_XBS5_ILP32_OFFBIG_LINTFLAGS + { _CS_XBS5_ILP32_OFFBIG_LINTFLAGS, "XBS5_ILP32_OFFBIG_LINTFLAGS" }, +#endif +#ifdef _CS_XBS5_LP64_OFF64_CFLAGS + { _CS_XBS5_LP64_OFF64_CFLAGS, "XBS5_LP64_OFF64_CFLAGS" }, +#endif +#ifdef _CS_XBS5_LP64_OFF64_LDFLAGS + { _CS_XBS5_LP64_OFF64_LDFLAGS, "XBS5_LP64_OFF64_LDFLAGS" }, +#endif +#ifdef _CS_XBS5_LP64_OFF64_LIBS + { _CS_XBS5_LP64_OFF64_LIBS, "XBS5_LP64_OFF64_LIBS" }, +#endif +#ifdef _CS_XBS5_LP64_OFF64_LINTFLAGS + { _CS_XBS5_LP64_OFF64_LINTFLAGS, "XBS5_LP64_OFF64_LINTFLAGS" }, +#endif +#ifdef _CS_XBS5_LPBIG_OFFBIG_CFLAGS + { _CS_XBS5_LPBIG_OFFBIG_CFLAGS, "XBS5_LPBIG_OFFBIG_CFLAGS" }, +#endif +#ifdef _CS_XBS5_LPBIG_OFFBIG_LDFLAGS + { _CS_XBS5_LPBIG_OFFBIG_LDFLAGS, "XBS5_LPBIG_OFFBIG_LDFLAGS" }, +#endif +#ifdef _CS_XBS5_LPBIG_OFFBIG_LIBS + { _CS_XBS5_LPBIG_OFFBIG_LIBS, "XBS5_LPBIG_OFFBIG_LIBS" }, +#endif +#ifdef _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS + { _CS_XBS5_LPBIG_OFFBIG_LINTFLAGS, "XBS5_LPBIG_OFFBIG_LINTFLAGS" }, +#endif }; -char *TCID = "confstr01"; -int TST_TOTAL = ARRAY_SIZE(test_cases); - -static void setup(void); -static void cleanup(void); - -int main(int argc, char *argv[]) +static void run(unsigned int i) { - int lc; - int i; char *buf; int len; - tst_parse_opts(argc, argv, NULL, NULL); - - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) { + TST_EXP_POSITIVE(confstr(test_cases[i].value, NULL, (size_t)0)); - tst_count = 0; + if (!TST_RET) + return; - for (i = 0; i < TST_TOTAL; i++) { + len = TST_RET; + buf = SAFE_MALLOC(len); - TEST(confstr(test_cases[i].value, NULL, (size_t)0)); + TEST(confstr(test_cases[i].value, buf, len)); - if (TEST_RETURN != 0) { - len = TEST_RETURN; - buf = SAFE_MALLOC(cleanup, len); - TEST(confstr(test_cases[i].value, buf, len)); - - if (TEST_RETURN != len || buf[len-1] != '\0') { - tst_brkm(TBROK, cleanup, - "confstr :%s failed", - test_cases[i].name); - } else { - tst_resm(TPASS, "confstr %s = '%s'", - test_cases[i].name, buf); - } - free(buf); - } else { - if (TEST_ERRNO == EINVAL) { - tst_resm(TCONF, - "confstr %s not supported", - test_cases[i].name); - } else { - tst_resm(TFAIL, - "confstr %s failed", - test_cases[i].name); - } - } - } + if (buf[len - 1] != '\0') { + tst_brk(TFAIL, "confstr: %s, %s", test_cases[i].name, + tst_strerrno(TST_ERR)); + } else { + tst_res(TPASS, "confstr %s = '%s'", test_cases[i].name, buf); } - cleanup(); - - tst_exit(); + free(buf); } -static void setup(void) -{ - TEST_PAUSE; -} - -static void cleanup(void) -{ -} +static struct tst_test test = { + .test = run, + .tcnt = ARRAY_SIZE(test_cases), +};