Message ID | 20180309092701.8161-2-mmoese@suse.de |
---|---|
State | Superseded |
Headers | show |
Series | [v2,1/3] Add tst_flush() library function | expand |
Hi! > The old tst_flush() was renamed to tst_old_flush(), and tst_flush() > was removed from tstapicmd.c. > The new tst_flush() has the same prototype as the old one, so any test > using it should still be fine. There are calls to tst_flush() in the lib/tst_res.c as well as in the oldlib tests, these have to call the tst_old_flush(). Also this patch should be first in the series since ideally the git tree should be compileable after each patch so that we do not break bisections.
diff --git a/lib/tst_res.c b/lib/tst_res.c index b56f37db0..9c88b2923 100644 --- a/lib/tst_res.c +++ b/lib/tst_res.c @@ -245,7 +245,7 @@ static void tst_condense(int tnum, int ttype, const char *tmesg) Buffered = TRUE; } -void tst_flush(void) +void tst_old_flush(void) { NO_NEWLIB_ASSERT("Unknown", 0); diff --git a/tools/apicmds/ltpapicmd.c b/tools/apicmds/ltpapicmd.c index 9ad68b589..4b66c4226 100644 --- a/tools/apicmds/ltpapicmd.c +++ b/tools/apicmds/ltpapicmd.c @@ -34,8 +34,6 @@ * break remaining test cases * tst_res - Print result message, including file contents * tst_resm - Print result message - * tst_flush - Print any messages pending because of CONDENSE mode, - * and flush output stream * tst_exit - Exit test with a meaningful exit value * * These are the minimum set of functions or commands required to @@ -332,8 +330,6 @@ int main(int argc, char *argv[]) apicmd_resm(argc, argv); } else if (strcmp(cmd_name, "tst_exit") == 0) { tst_exit(); - } else if (strcmp(cmd_name, "tst_flush") == 0) { - tst_flush(); } else if (strcmp(cmd_name, "tst_ncpus") == 0) { printf("%li\n", tst_ncpus()); } else if (strcmp(cmd_name, "tst_ncpus_conf") == 0) {
The old tst_flush() was renamed to tst_old_flush(), and tst_flush() was removed from tstapicmd.c. The new tst_flush() has the same prototype as the old one, so any test using it should still be fine. Signed-off-by: Michael Moese <mmoese@suse.de> --- lib/tst_res.c | 2 +- tools/apicmds/ltpapicmd.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-)