| Message ID | 20230525080934.54793-2-liwang@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] FILE_PRINTF|SCANF: changing TWARN to TINFO | expand |
Hi Li, > SAFE_MACROS() used in cleanup do not exit the test anymore since: > commit 6440c5d0d15 (newlib: Allow SAFE_MACROS to be called from cleanup) > Signed-off-by: Li Wang <liwang@redhat.com> > --- > testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c | 4 ++-- > testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c | 2 +- > testcases/kernel/syscalls/fcntl/fcntl33.c | 2 +- > testcases/kernel/syscalls/readahead/readahead02.c | 2 +- > 4 files changed, 5 insertions(+), 5 deletions(-) > diff --git a/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c b/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c > index 67917b3fe..0a56519a1 100644 > --- a/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c > +++ b/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c > @@ -78,10 +78,10 @@ static void check_set_turbo(char *file, char *off) > static void cleanup(void) > { > - FILE_PRINTF(cdrv[id].file, "%d", boost_value); > + SAFE_FILE_PRINTF(cleanup, cdrv[id].file, "%d", boost_value); testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c uses old API, IMHO not affected by 6440c5d0d15. Therefore we should postpone this till it's converted to the new API. The rest LGTM. Reviewed-by: Petr Vorel <pvorel@suse.cz> Kind regards, Petr
Hi Petr, On Fri, May 26, 2023 at 10:25 PM Petr Vorel <pvorel@suse.cz> wrote: > > --- a/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c > > +++ b/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c > > @@ -78,10 +78,10 @@ static void check_set_turbo(char *file, char *off) > > > static void cleanup(void) > > { > > - FILE_PRINTF(cdrv[id].file, "%d", boost_value); > > + SAFE_FILE_PRINTF(cleanup, cdrv[id].file, "%d", boost_value); > > testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c uses old API, > IMHO not affected by 6440c5d0d15. Therefore we should postpone this till > it's > converted to the new API. > That's right. I revert the change and pushed it, thanks!!
diff --git a/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c b/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c index 67917b3fe..0a56519a1 100644 --- a/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c +++ b/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c @@ -78,10 +78,10 @@ static void check_set_turbo(char *file, char *off) static void cleanup(void) { - FILE_PRINTF(cdrv[id].file, "%d", boost_value); + SAFE_FILE_PRINTF(cleanup, cdrv[id].file, "%d", boost_value); if (governor[0] != '\0') - FILE_PRINTF(governor, "%s", governor_name); + SAFE_FILE_PRINTF(cleanup, governor, "%s", governor_name); } static void setup(void) diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c index 7e72a19ca..625761f6e 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c @@ -84,7 +84,7 @@ static void cleanup(void) rm_shm(shm_id_arr[i]); if (orig_shmmni != -1) - FILE_PRINTF(PATH_SHMMNI, "%ld", orig_shmmni); + SAFE_FILE_PRINTF(PATH_SHMMNI, "%ld", orig_shmmni); } static struct tst_test test = { diff --git a/testcases/kernel/syscalls/fcntl/fcntl33.c b/testcases/kernel/syscalls/fcntl/fcntl33.c index 8d0d1a5a1..3c6a38b81 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl33.c +++ b/testcases/kernel/syscalls/fcntl/fcntl33.c @@ -209,7 +209,7 @@ static void cleanup(void) SAFE_CLOSE(fd); /* Restore the lease-break-time. */ - FILE_PRINTF(PATH_LS_BRK_T, "%d", ls_brk_t); + SAFE_FILE_PRINTF(PATH_LS_BRK_T, "%d", ls_brk_t); } static struct tst_test test = { diff --git a/testcases/kernel/syscalls/readahead/readahead02.c b/testcases/kernel/syscalls/readahead/readahead02.c index 7acf4bb18..b6c097b31 100644 --- a/testcases/kernel/syscalls/readahead/readahead02.c +++ b/testcases/kernel/syscalls/readahead/readahead02.c @@ -352,7 +352,7 @@ static void setup_readahead_length(void) /* raise bdi limit as much as kernel allows */ ra_new_limit = testfile_size / 1024; while (ra_new_limit > pagesize / 1024) { - FILE_PRINTF(sys_bdi_ra_path, "%d", ra_new_limit); + SAFE_FILE_PRINTF(sys_bdi_ra_path, "%d", ra_new_limit); SAFE_FILE_SCANF(sys_bdi_ra_path, "%d", &ra_limit); if (ra_limit == ra_new_limit) {
SAFE_MACROS() used in cleanup do not exit the test anymore since: commit 6440c5d0d15 (newlib: Allow SAFE_MACROS to be called from cleanup) Signed-off-by: Li Wang <liwang@redhat.com> --- testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c | 4 ++-- testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c | 2 +- testcases/kernel/syscalls/fcntl/fcntl33.c | 2 +- testcases/kernel/syscalls/readahead/readahead02.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)