From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C679BC433F5 for ; Mon, 24 Jan 2022 14:43:15 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 157493C8840 for ; Mon, 24 Jan 2022 15:43:13 +0100 (CET) Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [217.194.8.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 29B9E3C7E58 for ; Mon, 24 Jan 2022 15:43:02 +0100 (CET) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) (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-4.smtp.seeweb.it (Postfix) with ESMTPS id 6E34010009F5 for ; Mon, 24 Jan 2022 15:43:02 +0100 (CET) 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-out2.suse.de (Postfix) with ESMTPS id 7068D1F38B; Mon, 24 Jan 2022 14:43:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1643035381; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=20iTS7b1EqcePa0So8//Nn/9q29HpEhiWHs/kMtYt7I=; b=LNcSXEVMstKfzwIgwV3HC2+fAZywWYzapbRyXOJjvJPjRTLQ3Wt++NWRT6txWz3ukmpVvM GcJ37YfutL8JdZQXrCG90zsb7OsOd2VSQI2sIJl4gzIgnAf3X5PlLs7VNTQiYU5XkAq5HP KZmM+31ZhLg9H2lF5gLj9/80P815ozE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1643035381; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=20iTS7b1EqcePa0So8//Nn/9q29HpEhiWHs/kMtYt7I=; b=2U6mXfGK/08iJL1EeP1yX+oGAKsFVkcgb0+8yeEWu0j+UEcEOwr5X5pEgi5EoyalNHmzxF Wj3fK1g1sU6f/KAg== 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 574C513BA5; Mon, 24 Jan 2022 14:43:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id W+FDFfW67mHufwAAMHmgww (envelope-from ); Mon, 24 Jan 2022 14:43:01 +0000 Date: Mon, 24 Jan 2022 15:44:47 +0100 From: Cyril Hrubis To: Andrea Cervesato Message-ID: References: <20220119152732.21189-1-andrea.cervesato@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220119152732.21189-1-andrea.cervesato@suse.de> X-Virus-Scanned: clamav-milter 0.102.4 at in-4.smtp.seeweb.it X-Virus-Status: Clean Subject: Re: [LTP] [PATCH v1] Replace ltp_syscall with tst_syscall 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: , Cc: ltp@lists.linux.it Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" Hi! > diff --git a/include/lapi/syscalls/regen.sh b/include/lapi/syscalls/regen.sh > index d7daf8ad0..8fa381c97 100755 > --- a/include/lapi/syscalls/regen.sh > +++ b/include/lapi/syscalls/regen.sh > @@ -35,34 +35,30 @@ cat << EOF > "${output_pid}" > #include > #include "cleanup.c" > > -#define ltp_syscall(NR, ...) ({ \\ > - int __ret; \\ > - if (NR == __LTP__NR_INVALID_SYSCALL) { \\ > - errno = ENOSYS; \\ > - __ret = -1; \\ > - } else { \\ > - __ret = syscall(NR, ##__VA_ARGS__); \\ > - } \\ > - if (__ret == -1 && errno == ENOSYS) { \\ > - tst_brkm(TCONF, CLEANUP, \\ > - "syscall(%d) " #NR " not supported on your arch", \\ > - NR); \\ > - } \\ > - __ret; \\ > +#ifdef TST_TEST_H__ > +#define TST_SYSCALL_BRK__(NR) ({ \ > + tst_brk(TCONF, \ > + "syscall(%d) " #NR " not supported on your arch", NR); \ > }) > - > -#define tst_syscall(NR, ...) ({ \\ > - int tst_ret; \\ > - if (NR == __LTP__NR_INVALID_SYSCALL) { \\ > - errno = ENOSYS; \\ > - tst_ret = -1; \\ > - } else { \\ > - tst_ret = syscall(NR, ##__VA_ARGS__); \\ > - } \\ > - if (tst_ret == -1 && errno == ENOSYS) { \\ > - tst_brk(TCONF, "syscall(%d) " #NR " not supported", NR); \\ > - } \\ > - tst_ret; \\ > +#else > +#define TST_SYSCALL_BRK__(NR) ({ \ > + tst_brkm(TCONF, CLEANUP, \ > + "syscall(%d) " #NR " not supported on your arch", NR); \ > +}) > +#endif > + > +#define tst_syscall(NR, ...) ({ \ > + int tst_ret; \ > + if (NR == __LTP__NR_INVALID_SYSCALL) { \ > + errno = ENOSYS; \ > + tst_ret = -1; \ > + } else { \ > + tst_ret = syscall(NR, ##__VA_ARGS__); \ > + } \ > + if (tst_ret == -1 && errno == ENOSYS) { \ > + TST_SYSCALL_BRK__(NR); \ > + } \ > + tst_ret; \ > }) Can we please keep the double backslashes here? Both of them works, but if you put single backslash here into the script the macro is put into one long line into the generated header, which is really hard to decipher. With two the macro is split into lines as it should be. Other than that it looks good and simplifies a some of the places. With the backslashes fixed: Reviewed-by: Cyril Hrubis -- Cyril Hrubis chrubis@suse.cz -- Mailing list info: https://lists.linux.it/listinfo/ltp