From: Richard Palethorpe <rpalethorpe@suse.com>
To: ltp@lists.linux.it
Subject: [LTP] [RFC PATCH 3/6] API: Add tst_ to file_* functions
Date: Mon, 17 May 2021 17:30:26 +0100 [thread overview]
Message-ID: <20210517163029.22974-4-rpalethorpe@suse.com> (raw)
In-Reply-To: <20210517163029.22974-1-rpalethorpe@suse.com>
Usually LTP library functions are prepended with tst_ if not with
safe_.
Signed-off-by: Richard Palethorpe <rpalethorpe@suse.com>
---
doc/test-writing-guidelines.txt | 2 +-
include/old/old_safe_file_ops.h | 14 ++++++------
include/safe_file_ops_fn.h | 22 +++++++++----------
include/tst_safe_file_ops.h | 20 ++++++++---------
lib/newlib_tests/tst_safe_fileops.c | 4 ++--
lib/safe_file_ops.c | 10 ++++-----
lib/tst_assert.c | 4 ++--
lib/tst_sys_conf.c | 2 +-
testcases/cve/meltdown.c | 2 +-
.../device-drivers/cpufreq/cpufreq_boost.c | 4 ++--
.../mem/hugetlb/hugeshmget/hugeshmget03.c | 2 +-
testcases/kernel/mem/ksm/ksm01.c | 4 ++--
testcases/kernel/mem/ksm/ksm02.c | 4 ++--
testcases/kernel/mem/ksm/ksm03.c | 4 ++--
testcases/kernel/mem/ksm/ksm04.c | 4 ++--
testcases/kernel/mem/ksm/ksm05.c | 2 +-
testcases/kernel/mem/ksm/ksm06.c | 8 +++----
testcases/kernel/mem/swapping/swapping01.c | 2 +-
testcases/kernel/syscalls/fcntl/fcntl33.c | 2 +-
testcases/kernel/syscalls/fork/fork13.c | 2 +-
.../syscalls/migrate_pages/migrate_pages02.c | 2 +-
testcases/kernel/syscalls/prctl/prctl06.c | 2 +-
.../kernel/syscalls/readahead/readahead02.c | 2 +-
testcases/kernel/tracing/pt_test/pt_test.c | 4 ++--
.../network/can/filter-tests/can_common.h | 2 +-
testcases/network/packet/fanout01.c | 6 ++---
26 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/doc/test-writing-guidelines.txt b/doc/test-writing-guidelines.txt
index c268b8804..74f168e06 100644
--- a/doc/test-writing-guidelines.txt
+++ b/doc/test-writing-guidelines.txt
@@ -1715,7 +1715,7 @@ static const char *save_restore[] = {
static void setup(void)
{
- FILE_PRINTF("/proc/sys/kernel/core_pattern", "/mypath");
+ TST_FILE_PRINTF("/proc/sys/kernel/core_pattern", "/mypath");
}
static struct tst_test test = {
diff --git a/include/old/old_safe_file_ops.h b/include/old/old_safe_file_ops.h
index d6e2d29a9..d36079ab5 100644
--- a/include/old/old_safe_file_ops.h
+++ b/include/old/old_safe_file_ops.h
@@ -30,24 +30,24 @@
#include "safe_file_ops_fn.h"
-#define FILE_SCANF(path, fmt, ...) \
- file_scanf(__FILE__, __LINE__, \
- (path), (fmt), ## __VA_ARGS__)
+#define TST_FILE_SCANF(path, fmt, ...) \
+ tst_file_scanf(__FILE__, __LINE__, \
+ (path), (fmt), ## __VA_ARGS__)
#define SAFE_FILE_SCANF(cleanup_fn, path, fmt, ...) \
safe_file_scanf(__FILE__, __LINE__, (cleanup_fn), \
(path), (fmt), ## __VA_ARGS__)
#define FILE_LINES_SCANF(cleanup_fn, path, fmt, ...) \
- file_lines_scanf(__FILE__, __LINE__, (cleanup_fn), 0, \
+ tst_file_lines_scanf(__FILE__, __LINE__, (cleanup_fn), 0, \
(path), (fmt), ## __VA_ARGS__)
#define SAFE_FILE_LINES_SCANF(cleanup_fn, path, fmt, ...) \
- file_lines_scanf(__FILE__, __LINE__, (cleanup_fn), 1, \
+ tst_file_lines_scanf(__FILE__, __LINE__, (cleanup_fn), 1, \
(path), (fmt), ## __VA_ARGS__)
-#define FILE_PRINTF(path, fmt, ...) \
- file_printf(__FILE__, __LINE__, \
+#define TST_FILE_PRINTF(path, fmt, ...) \
+ tst_file_printf(__FILE__, __LINE__, \
(path), (fmt), ## __VA_ARGS__)
#define SAFE_FILE_PRINTF(cleanup_fn, path, fmt, ...) \
diff --git a/include/safe_file_ops_fn.h b/include/safe_file_ops_fn.h
index 6d680967b..620e12e9a 100644
--- a/include/safe_file_ops_fn.h
+++ b/include/safe_file_ops_fn.h
@@ -36,31 +36,31 @@ int tst_count_scanf_conversions(const char *fmt);
/*
* All-in-one function to scanf value(s) from a file.
*/
-int file_scanf(const char *file, const int lineno,
- const char *path, const char *fmt, ...)
- __attribute__ ((format (scanf, 4, 5)));
+int tst_file_scanf(const char *file, const int lineno,
+ const char *path, const char *fmt, ...)
+ __attribute__ ((format (scanf, 4, 5)));
void safe_file_scanf(const char *file, const int lineno,
void (*cleanup_fn)(void),
const char *path, const char *fmt, ...)
__attribute__ ((format (scanf, 5, 6)));
-int file_lines_scanf(const char *file, const int lineno,
- void (*cleanup_fn)(void), int strict,
- const char *path, const char *fmt, ...)
- __attribute__ ((format (scanf, 6, 7)));
+int tst_file_lines_scanf(const char *file, const int lineno,
+ void (*cleanup_fn)(void), int strict,
+ const char *path, const char *fmt, ...)
+ __attribute__ ((format (scanf, 6, 7)));
/*
* All-in-one function that lets you printf directly into a file.
*/
-int file_printf(const char *file, const int lineno,
- const char *path, const char *fmt, ...)
- __attribute__ ((format (printf, 4, 5)));
+int tst_file_printf(const char *file, const int lineno,
+ const char *path, const char *fmt, ...)
+ __attribute__ ((format (printf, 4, 5)));
void safe_file_printf(const char *file, const int lineno,
void (*cleanup_fn)(void),
const char *path, const char *fmt, ...)
- __attribute__ ((format (printf, 5, 6)));
+ __attribute__ ((format (printf, 5, 6)));
/*
* Safe function to copy files, no more system("cp ...") please.
diff --git a/include/tst_safe_file_ops.h b/include/tst_safe_file_ops.h
index 223eddd1f..7457edd61 100644
--- a/include/tst_safe_file_ops.h
+++ b/include/tst_safe_file_ops.h
@@ -7,20 +7,20 @@
#include "safe_file_ops_fn.h"
-#define FILE_SCANF(path, fmt, ...) \
- file_scanf(__FILE__, __LINE__, (path), (fmt), ## __VA_ARGS__)
+#define TST_FILE_SCANF(path, fmt, ...) \
+ tst_file_scanf(__FILE__, __LINE__, (path), (fmt), ## __VA_ARGS__)
#define SAFE_FILE_SCANF(path, fmt, ...) \
safe_file_scanf(__FILE__, __LINE__, NULL, \
(path), (fmt), ## __VA_ARGS__)
-#define FILE_LINES_SCANF(path, fmt, ...) \
- file_lines_scanf(__FILE__, __LINE__, NULL, 0,\
- (path), (fmt), ## __VA_ARGS__)
+#define TST_FILE_LINES_SCANF(path, fmt, ...) \
+ tst_file_lines_scanf(__FILE__, __LINE__, NULL, 0,\
+ (path), (fmt), ## __VA_ARGS__)
#define SAFE_FILE_LINES_SCANF(path, fmt, ...) \
- file_lines_scanf(__FILE__, __LINE__, NULL, 1,\
- (path), (fmt), ## __VA_ARGS__)
+ tst_file_lines_scanf(__FILE__, __LINE__, NULL, 1,\
+ (path), (fmt), ## __VA_ARGS__)
#define SAFE_READ_MEMINFO(item) \
({long tst_rval; \
@@ -36,9 +36,9 @@
&tst_rval_); \
tst_rval_;})
-#define FILE_PRINTF(path, fmt, ...) \
- file_printf(__FILE__, __LINE__, \
- (path), (fmt), ## __VA_ARGS__)
+#define TST_FILE_PRINTF(path, fmt, ...) \
+ tst_file_printf(__FILE__, __LINE__, \
+ (path), (fmt), ## __VA_ARGS__)
#define SAFE_FILE_PRINTF(path, fmt, ...) \
safe_file_printf(__FILE__, __LINE__, NULL, \
diff --git a/lib/newlib_tests/tst_safe_fileops.c b/lib/newlib_tests/tst_safe_fileops.c
index e8419bd23..d6a7030f6 100644
--- a/lib/newlib_tests/tst_safe_fileops.c
+++ b/lib/newlib_tests/tst_safe_fileops.c
@@ -13,11 +13,11 @@ static void do_test(void)
long dummy;
SAFE_FILE_LINES_SCANF("/proc/meminfo", "MemFree: %ld", &free);
- if (FILE_LINES_SCANF("/proc/stat", "processes %ld", &nproc))
+ if (TST_FILE_LINES_SCANF("/proc/stat", "processes %ld", &nproc))
tst_brk(TBROK, "Could not parse processes");
tst_res(TPASS, "Free: %ld, nproc: %ld", free, nproc);
- if (FILE_LINES_SCANF("/proc/stat", "non-existent %ld", &dummy))
+ if (TST_FILE_LINES_SCANF("/proc/stat", "non-existent %ld", &dummy))
tst_res(TPASS, "non-existent not found");
SAFE_FILE_LINES_SCANF("/proc/stat", "non-existent %ld", &dummy);
}
diff --git a/lib/safe_file_ops.c b/lib/safe_file_ops.c
index 249a512a1..132530345 100644
--- a/lib/safe_file_ops.c
+++ b/lib/safe_file_ops.c
@@ -66,7 +66,7 @@ int tst_count_scanf_conversions(const char *fmt)
return cnt;
}
-int file_scanf(const char *file, const int lineno,
+int tst_file_scanf(const char *file, const int lineno,
const char *path, const char *fmt, ...)
{
va_list va;
@@ -165,9 +165,9 @@ void safe_file_scanf(const char *file, const int lineno,
* to scanf format 'fmt'. If all fields could be parsed, stop and
* return 0, otherwise continue or return 1 if EOF is reached.
*/
-int file_lines_scanf(const char *file, const int lineno,
- void (*cleanup_fn)(void), int strict,
- const char *path, const char *fmt, ...)
+int tst_file_lines_scanf(const char *file, const int lineno,
+ void (*cleanup_fn)(void), int strict,
+ const char *path, const char *fmt, ...)
{
FILE *fp;
int ret = 0;
@@ -209,7 +209,7 @@ int file_lines_scanf(const char *file, const int lineno,
return !(ret == arg_count);
}
-int file_printf(const char *file, const int lineno,
+int tst_file_printf(const char *file, const int lineno,
const char *path, const char *fmt, ...)
{
va_list va;
diff --git a/lib/tst_assert.c b/lib/tst_assert.c
index 9b8ebc167..8c7beb2fd 100644
--- a/lib/tst_assert.c
+++ b/lib/tst_assert.c
@@ -43,7 +43,7 @@ void tst_assert_file_int(const char *file, const int lineno, const char *path, c
char fmt[1024];
snprintf(fmt, sizeof(fmt), "%s%%d", prefix);
- file_lines_scanf(file, lineno, NULL, 1, path, fmt, &sys_val);
+ tst_file_lines_scanf(file, lineno, NULL, 1, path, fmt, &sys_val);
if (val == sys_val) {
tst_res_(file, lineno, TPASS, "%s %s = %d", path, prefix, sys_val);
@@ -72,7 +72,7 @@ void tst_assert_file_str(const char *file, const int lineno, const char *path, c
char fmt[2048];
snprintf(fmt, sizeof(fmt), "%s: %%1024s", prefix);
- file_lines_scanf(file, lineno, NULL, 1, path, fmt, sys_val);
+ tst_file_lines_scanf(file, lineno, NULL, 1, path, fmt, sys_val);
if (!strcmp(val, sys_val)) {
tst_res_(file, lineno, TPASS, "%s %s = '%s'", path, prefix, sys_val);
diff --git a/lib/tst_sys_conf.c b/lib/tst_sys_conf.c
index 4ad9f8b9b..f604966d2 100644
--- a/lib/tst_sys_conf.c
+++ b/lib/tst_sys_conf.c
@@ -99,7 +99,7 @@ void tst_sys_conf_restore(int verbose)
tst_res(TINFO, "Restoring conf.: %s -> %s\n",
i->path, i->value);
}
- FILE_PRINTF(i->path, "%s", i->value);
+ TST_FILE_PRINTF(i->path, "%s", i->value);
}
}
diff --git a/testcases/cve/meltdown.c b/testcases/cve/meltdown.c
index a387b3205..f854b9195 100644
--- a/testcases/cve/meltdown.c
+++ b/testcases/cve/meltdown.c
@@ -261,7 +261,7 @@ find_symbol_in_file(const char *filename, const char *symname)
sprintf(fmt, "%%lx %%c %s%%c", symname);
- ret = FILE_LINES_SCANF(filename, fmt, &addr, &type, &read);
+ ret = TST_FILE_LINES_SCANF(filename, fmt, &addr, &type, &read);
if (ret)
return 0;
diff --git a/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c b/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c
index b9739db37..a5f3ce3f8 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);
+ TST_FILE_PRINTF(cdrv[id].file, "%d", boost_value);
if (governor[0] != '\0')
- FILE_PRINTF(governor, "%s", governor_name);
+ TST_FILE_PRINTF(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 2053d0a98..f18c1a124 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);
+ TST_FILE_PRINTF(PATH_SHMMNI, "%ld", orig_shmmni);
}
static struct tst_test test = {
diff --git a/testcases/kernel/mem/ksm/ksm01.c b/testcases/kernel/mem/ksm/ksm01.c
index cd2c5c6ee..2d63da20b 100644
--- a/testcases/kernel/mem/ksm/ksm01.c
+++ b/testcases/kernel/mem/ksm/ksm01.c
@@ -88,8 +88,8 @@ static void setup(void)
static void cleanup(void)
{
if (access(PATH_KSM "merge_across_nodes", F_OK) == 0)
- FILE_PRINTF(PATH_KSM "merge_across_nodes",
- "%d", merge_across_nodes);
+ TST_FILE_PRINTF(PATH_KSM "merge_across_nodes",
+ "%d", merge_across_nodes);
}
static struct tst_test test = {
diff --git a/testcases/kernel/mem/ksm/ksm02.c b/testcases/kernel/mem/ksm/ksm02.c
index 80017df66..f4595db0f 100644
--- a/testcases/kernel/mem/ksm/ksm02.c
+++ b/testcases/kernel/mem/ksm/ksm02.c
@@ -88,8 +88,8 @@ static void verify_ksm(void)
static void cleanup(void)
{
if (access(PATH_KSM "merge_across_nodes", F_OK) == 0)
- FILE_PRINTF(PATH_KSM "merge_across_nodes",
- "%d", merge_across_nodes);
+ TST_FILE_PRINTF(PATH_KSM "merge_across_nodes",
+ "%d", merge_across_nodes);
tst_cgroup_cleanup();
}
diff --git a/testcases/kernel/mem/ksm/ksm03.c b/testcases/kernel/mem/ksm/ksm03.c
index 83b821c81..f7b29b9b5 100644
--- a/testcases/kernel/mem/ksm/ksm03.c
+++ b/testcases/kernel/mem/ksm/ksm03.c
@@ -88,8 +88,8 @@ static void setup(void)
static void cleanup(void)
{
if (access(PATH_KSM "merge_across_nodes", F_OK) == 0)
- FILE_PRINTF(PATH_KSM "merge_across_nodes",
- "%d", merge_across_nodes);
+ TST_FILE_PRINTF(PATH_KSM "merge_across_nodes",
+ "%d", merge_across_nodes);
tst_cgroup_cleanup();
}
diff --git a/testcases/kernel/mem/ksm/ksm04.c b/testcases/kernel/mem/ksm/ksm04.c
index 65f7e6510..4de06e13b 100644
--- a/testcases/kernel/mem/ksm/ksm04.c
+++ b/testcases/kernel/mem/ksm/ksm04.c
@@ -87,8 +87,8 @@ static void verify_ksm(void)
static void cleanup(void)
{
if (access(PATH_KSM "merge_across_nodes", F_OK) == 0)
- FILE_PRINTF(PATH_KSM "merge_across_nodes",
- "%d", merge_across_nodes);
+ TST_FILE_PRINTF(PATH_KSM "merge_across_nodes",
+ "%d", merge_across_nodes);
tst_cgroup_cleanup();
}
diff --git a/testcases/kernel/mem/ksm/ksm05.c b/testcases/kernel/mem/ksm/ksm05.c
index 380bb0202..bc4ac9e64 100644
--- a/testcases/kernel/mem/ksm/ksm05.c
+++ b/testcases/kernel/mem/ksm/ksm05.c
@@ -99,7 +99,7 @@ static void cleanup(void)
{
/* restore /sys/kernel/mm/ksm/run value */
if (ksm_run_orig > 0)
- FILE_PRINTF(PATH_KSM "run", "%d", ksm_run_orig);
+ TST_FILE_PRINTF(PATH_KSM "run", "%d", ksm_run_orig);
}
static struct tst_test test = {
diff --git a/testcases/kernel/mem/ksm/ksm06.c b/testcases/kernel/mem/ksm/ksm06.c
index 1c435586e..b0c374de0 100644
--- a/testcases/kernel/mem/ksm/ksm06.c
+++ b/testcases/kernel/mem/ksm/ksm06.c
@@ -75,15 +75,15 @@ static void setup(void)
static void cleanup(void)
{
if (merge_across_nodes != -1) {
- FILE_PRINTF(PATH_KSM "merge_across_nodes",
- "%d", merge_across_nodes);
+ TST_FILE_PRINTF(PATH_KSM "merge_across_nodes",
+ "%d", merge_across_nodes);
}
if (sleep_millisecs != -1)
- FILE_PRINTF(PATH_KSM "sleep_millisecs", "%d", sleep_millisecs);
+ TST_FILE_PRINTF(PATH_KSM "sleep_millisecs", "%d", sleep_millisecs);
if (run != -1)
- FILE_PRINTF(PATH_KSM "run", "%d", run);
+ TST_FILE_PRINTF(PATH_KSM "run", "%d", run);
}
static struct tst_test test = {
diff --git a/testcases/kernel/mem/swapping/swapping01.c b/testcases/kernel/mem/swapping/swapping01.c
index 66fc65cbe..49399af3e 100644
--- a/testcases/kernel/mem/swapping/swapping01.c
+++ b/testcases/kernel/mem/swapping/swapping01.c
@@ -83,7 +83,7 @@ static void test_swapping(void)
static void init_meminfo(void)
{
swap_free_init = SAFE_READ_MEMINFO("SwapFree:");
- if (FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %ld",
+ if (TST_FILE_LINES_SCANF("/proc/meminfo", "MemAvailable: %ld",
&mem_available_init)) {
mem_available_init = SAFE_READ_MEMINFO("MemFree:")
+ SAFE_READ_MEMINFO("Cached:");
diff --git a/testcases/kernel/syscalls/fcntl/fcntl33.c b/testcases/kernel/syscalls/fcntl/fcntl33.c
index 8d0d1a5a1..9a90b6888 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);
+ TST_FILE_PRINTF(PATH_LS_BRK_T, "%d", ls_brk_t);
}
static struct tst_test test = {
diff --git a/testcases/kernel/syscalls/fork/fork13.c b/testcases/kernel/syscalls/fork/fork13.c
index 583c8bd4d..751166417 100644
--- a/testcases/kernel/syscalls/fork/fork13.c
+++ b/testcases/kernel/syscalls/fork/fork13.c
@@ -143,7 +143,7 @@ static void setup(void)
static void cleanup(void)
{
/* Restore pid_max value. */
- FILE_PRINTF(PID_MAX_PATH, "%lu", pid_max);
+ TST_FILE_PRINTF(PID_MAX_PATH, "%lu", pid_max);
}
/* The distance mod PIDMAX between two pids, where the first pid is
diff --git a/testcases/kernel/syscalls/migrate_pages/migrate_pages02.c b/testcases/kernel/syscalls/migrate_pages/migrate_pages02.c
index 485a1c5aa..66795cf05 100644
--- a/testcases/kernel/syscalls/migrate_pages/migrate_pages02.c
+++ b/testcases/kernel/syscalls/migrate_pages/migrate_pages02.c
@@ -276,7 +276,7 @@ static void setup(void)
else if (tst_kvercmp(2, 6, 18) < 0)
tst_brk(TCONF, "2.6.18 or greater kernel required");
- FILE_PRINTF("/proc/sys/kernel/numa_balancing", "0");
+ TST_FILE_PRINTF("/proc/sys/kernel/numa_balancing", "0");
/*
* find 2 nodes, which can hold NODE_MIN_FREEMEM bytes
* The reason is that:
diff --git a/testcases/kernel/syscalls/prctl/prctl06.c b/testcases/kernel/syscalls/prctl/prctl06.c
index 21d336c07..ad3afc49f 100644
--- a/testcases/kernel/syscalls/prctl/prctl06.c
+++ b/testcases/kernel/syscalls/prctl/prctl06.c
@@ -87,7 +87,7 @@ static void setup(void)
SAFE_CHOWN(BIN_PATH, 0, 0);
SAFE_CHMOD(BIN_PATH, SUID_MODE);
- if (FILE_LINES_SCANF(PROC_STATUS, "NoNewPrivs:%d", &field)) {
+ if (TST_FILE_LINES_SCANF(PROC_STATUS, "NoNewPrivs:%d", &field)) {
tst_res(TCONF, "%s doesn't support NoNewPrivs field", PROC_STATUS);
proc_flag = 0;
proc_sup = "No";
diff --git a/testcases/kernel/syscalls/readahead/readahead02.c b/testcases/kernel/syscalls/readahead/readahead02.c
index 258c70e21..6e1d99871 100644
--- a/testcases/kernel/syscalls/readahead/readahead02.c
+++ b/testcases/kernel/syscalls/readahead/readahead02.c
@@ -351,7 +351,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);
+ TST_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) {
diff --git a/testcases/kernel/tracing/pt_test/pt_test.c b/testcases/kernel/tracing/pt_test/pt_test.c
index 33db6d770..4ded80585 100644
--- a/testcases/kernel/tracing/pt_test/pt_test.c
+++ b/testcases/kernel/tracing/pt_test/pt_test.c
@@ -128,11 +128,11 @@ static int is_affected_by_erratum_BDM106(void)
{
int family = -1, model = -1;
- if (FILE_LINES_SCANF("/proc/cpuinfo", "cpu family%*s%d", &family)
+ if (TST_FILE_LINES_SCANF("/proc/cpuinfo", "cpu family%*s%d", &family)
|| family != 6)
return 0;
- if (!FILE_LINES_SCANF("/proc/cpuinfo", "model%*s%d", &model)) {
+ if (!TST_FILE_LINES_SCANF("/proc/cpuinfo", "model%*s%d", &model)) {
tst_res(TINFO, "Intel FAM6 model %d", model);
switch (model) {
diff --git a/testcases/network/can/filter-tests/can_common.h b/testcases/network/can/filter-tests/can_common.h
index af0cf5f00..63421849e 100644
--- a/testcases/network/can/filter-tests/can_common.h
+++ b/testcases/network/can/filter-tests/can_common.h
@@ -53,7 +53,7 @@ static void can_setup_vcan(void)
check_echo:
SAFE_ASPRINTF(&path, "/sys/class/net/%s/flags", can_dev_name);
- if (FILE_SCANF(path, "%x", &flags) || !(flags & IFF_ECHO)) {
+ if (TST_FILE_SCANF(path, "%x", &flags) || !(flags & IFF_ECHO)) {
tst_res(TWARN,
"Could not determine if ECHO is set on %s. This may effect code coverage.",
can_dev_name);
diff --git a/testcases/network/packet/fanout01.c b/testcases/network/packet/fanout01.c
index 5067d83a8..8e6a38c03 100644
--- a/testcases/network/packet/fanout01.c
+++ b/testcases/network/packet/fanout01.c
@@ -41,9 +41,9 @@ void setup(void)
if (TST_RET)
tst_brk(TBROK | TTERRNO, "Can't create new net namespace");
- FILE_PRINTF("/proc/self/setgroups", "deny");
- FILE_PRINTF("/proc/self/uid_map", "0 %d 1\n", real_uid);
- FILE_PRINTF("/proc/self/gid_map", "0 %d 1\n", real_gid);
+ TST_FILE_PRINTF("/proc/self/setgroups", "deny");
+ TST_FILE_PRINTF("/proc/self/uid_map", "0 %d 1\n", real_uid);
+ TST_FILE_PRINTF("/proc/self/gid_map", "0 %d 1\n", real_gid);
tst_fzsync_pair_init(&pair);
}
--
2.31.1
next prev parent reply other threads:[~2021-05-17 16:30 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-17 16:30 [LTP] [RFC PATCH 0/6] Check exported library symbols and cleanup Richard Palethorpe
2021-05-17 16:30 ` [LTP] [RFC PATCH 1/6] API: Make some internal symbols static Richard Palethorpe
2021-05-18 7:57 ` Petr Vorel
2021-05-17 16:30 ` [LTP] [RFC PATCH 2/6] API: Add tst_ to create_sig_proc Richard Palethorpe
2021-05-18 9:16 ` Li Wang
2021-05-19 15:13 ` Petr Vorel
2021-05-17 16:30 ` Richard Palethorpe [this message]
2021-05-18 9:23 ` [LTP] [RFC PATCH 3/6] API: Add tst_ to file_* functions Li Wang
2021-05-19 15:11 ` Petr Vorel
2021-05-17 16:30 ` [LTP] [RFC PATCH 4/6] API: add tst_ to mount_overlay Richard Palethorpe
2021-05-18 8:43 ` Li Wang
2021-05-19 15:12 ` Petr Vorel
2021-05-17 16:30 ` [LTP] [RFC PATCH 5/6] API: Add tst_ to hugepage opt vars Richard Palethorpe
2021-05-18 8:42 ` Li Wang
2021-05-17 16:30 ` [LTP] [RFC PATCH 6/6] API: Check exported symbols Richard Palethorpe
2021-05-18 8:18 ` Petr Vorel
2021-05-18 9:57 ` Richard Palethorpe
2021-05-18 14:57 ` Petr Vorel
2021-05-19 9:11 ` Richard Palethorpe
2021-05-19 12:02 ` Cyril Hrubis
2021-05-19 15:10 ` Petr Vorel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210517163029.22974-4-rpalethorpe@suse.com \
--to=rpalethorpe@suse.com \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.