From patchwork Fri Mar 9 14:16:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Moese X-Patchwork-Id: 883658 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.de Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zyTvR62wWz9sbX for ; Sat, 10 Mar 2018 01:16:19 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id EBCC23E749B for ; Fri, 9 Mar 2018 15:16:15 +0100 (CET) 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]) by picard.linux.it (Postfix) with ESMTP id 3F3513E71AB for ; Fri, 9 Mar 2018 15:16:14 +0100 (CET) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-6.smtp.seeweb.it (Postfix) with ESMTPS id 2FF7314088D2 for ; Fri, 9 Mar 2018 15:16:13 +0100 (CET) Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id D5521ACCF for ; Fri, 9 Mar 2018 14:16:12 +0000 (UTC) From: Michael Moese To: ltp@lists.linux.it Date: Fri, 9 Mar 2018 15:16:08 +0100 Message-Id: <20180309141609.2596-2-mmoese@suse.de> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180309141609.2596-1-mmoese@suse.de> References: <20180309141609.2596-1-mmoese@suse.de> X-Virus-Scanned: clamav-milter 0.99.2 at in-6.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=7.0 tests=SPF_PASS, T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-6.smtp.seeweb.it Subject: [LTP] [PATCH v3 2/3] Add new tst_flush() library function X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Add a new library function to flush stderr and stdout streams: void tst_flush(void) This function flushes stderr and stdout streams. In case of an error, the test is aborted with TBROK and an error message is printed. Signed-off-by: Michael Moese --- doc/test-writing-guidelines.txt | 8 ++++++++ include/tst_test.h | 3 +++ lib/tst_test.c | 15 +++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/doc/test-writing-guidelines.txt b/doc/test-writing-guidelines.txt index 739b295b8..4c60cd66b 100644 --- a/doc/test-writing-guidelines.txt +++ b/doc/test-writing-guidelines.txt @@ -465,6 +465,14 @@ Allows for setting timeout per test iteration dymanically in the test setup(), the timeout is specified in seconds. There are a few testcases whose runtime can vary arbitrarily, these can disable timeouts by setting it to -1. +[source,c] +------------------------------------------------------------------------------ +void tst_flush(void); +------------------------------------------------------------------------------- + +Flush stderr and stdout streams, handling errors appropriately. +You should not use fflush() for stderr or stdout. + 2.2.3 Test temporary directory ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/include/tst_test.h b/include/tst_test.h index af97b8983..54ff306d9 100644 --- a/include/tst_test.h +++ b/include/tst_test.h @@ -70,6 +70,9 @@ void tst_brk_(const char *file, const int lineno, int ttype, #define tst_brk(ttype, arg_fmt, ...) \ tst_brk_(__FILE__, __LINE__, (ttype), (arg_fmt), ##__VA_ARGS__) +/* flush stderr and stdout */ +void tst_flush(void); + pid_t safe_fork(const char *filename, unsigned int lineno); #define SAFE_FORK() \ safe_fork(__FILE__, __LINE__) diff --git a/lib/tst_test.c b/lib/tst_test.c index 2cf35ed66..9b4f43828 100644 --- a/lib/tst_test.c +++ b/lib/tst_test.c @@ -1085,3 +1085,18 @@ void tst_run_tcases(int argc, char *argv[], struct tst_test *self) do_exit(ret); } + + +void tst_flush(void) +{ + int rval; + + rval = fflush(stderr); + if (rval != 0) + tst_brk(TBROK | TERRNO, "fflush(stderr) failed"); + + rval = fflush(stderr); + if (rval != 0) + tst_brk(TBROK | TERRNO, "fflush(stdout) failed"); + +}