lib: make save_restore '?' prefix ignore also errors from open/read
PATCH 1/1 lib: make save_restore '?' prefix ignore also errors from open/read
Prefix '?' was meant to silently ignore non-existing paths. However there are some /proc files which exist, but trigger error only after open/read:
# ls -la /proc/sys/vm/nr_hugepages -rw-r--r--. 1 root root 0 Jun 25 04:17 /proc/sys/vm/nr_hugepages # cat /proc/sys/vm/nr_hugepages cat: /proc/sys/vm/nr_hugepages: Operation not supported
This leads to unavoidable TBROK. Extend '?' flag to cover also open/read.
--- doc/test-writing-guidelines.txt | 9 +++++---- lib/tst_sys_conf.c | 6 ++++++ 2 files changed, 11 insertions(+), 4 deletions(-)
doc/test-writing-guidelines.txt +5 -4
@@ -1515,10 +1515,11 @@ and restored at the end of the test. Only first line of a specified file is saved and restored. Pathnames can be optionally prefixed to specify how strictly (during -'store') are handled files that don't exist: - (no prefix) - test ends with TCONF - '?' - test prints info message and continues - '!' - test ends with TBROK +'store') are handled errors: + (no prefix) - test ends with TCONF, if file doesn't exist + '?' - test prints info message and continues, + if file doesn't exist or open/read fails + '!' - test ends with TBROK, if file doesn't exist 'restore' is always strict and will TWARN if it encounters any error.
lib/tst_sys_conf.c +6 -0
@@ -66,6 +66,9 @@ int tst_sys_conf_save(const char *path) fp =fopen (path,"r" );if (fp ==NULL ) { +if (flag =='?' ) +return 1 ; +tst_brk (TBROK |TERRNO ,"Failed to open FILE '%s' for reading" , path);return 1 ;
@@ -75,6 +78,9 @@ int tst_sys_conf_save(const char *path)fclose (fp);if (ret ==NULL ) { +if (flag =='?' ) +return 1 ; +tst_brk (TBROK |TERRNO ,"Failed to read anything from '%s'" , path); }
Signature · 1 line
1.8.3.1
PATCH 1/1 lib: make save_restore '?' prefix ignore also errors from open/read
The patch makes sense to me.
Quoted 68 lines · Jan Stancek
Prefix '?' was meant to silently ignore non-existing paths. However there are some /proc files which exist, but trigger error only after open/read:
# ls -la /proc/sys/vm/nr_hugepages -rw-r--r--. 1 root root 0 Jun 25 04:17 /proc/sys/vm/nr_hugepages # cat /proc/sys/vm/nr_hugepages cat: /proc/sys/vm/nr_hugepages: Operation not supportedThis leads to unavoidable TBROK. Extend '?' flag to cover also open/read.
Signed-off-by Jan Stancek <[email protected]>--- doc/test-writing-guidelines.txt | 9 +++++---- lib/tst_sys_conf.c | 6 ++++++ 2 files changed, 11 insertions(+), 4 deletions(-)doc/test-writing-guidelines.txt +0
-0@@ -1515,10 +1515,11 @@ and restored at the end of the test. Only firstline of a specified
file is saved and restored.Pathnames can be optionally prefixed to specify how strictly (during
-'store') are handled files that don't exist:doc/test-writing-guidelines.txt +5
-3- (no prefix) - test ends with TCONF - '?' - test prints info message and continues - '!' - test ends with TBROK +'store') are handled errors: + (no prefix) - test ends with TCONF, if file doesn't exist + '?' - test prints info message and continues, + if file doesn't exist or open/read fails + '!' - test ends with TBROK, if file doesn't exist 'restore' is always strict and will TWARN if it encounters any error.lib/tst_sys_conf.c +3
-0@@ -66,6 +66,9 @@ int tst_sys_conf_save(const char *path) fp =fopen (path,"r" );if (fp ==NULL ) { +if (flag =='?' ) +return 1 ; +tst_brk (TBROK |TERRNO ,"Failed to open FILE '%s' for reading", path);return 1;lib/tst_sys_conf.c +3
-0@@ -75,6 +78,9 @@ int tst_sys_conf_save(const char *path)fclose (fp);if (ret ==NULL ) { +if (flag =='?' ) +return 1 ; + tst_brk(TBROK | TERRNO, "Failed to read anything from '%s'", path);}--
1.8.3.1
Signature · 5 lines
Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20190626/764b0e11/attachment-0001.htm>
PATCH 1/1 lib: make save_restore '?' prefix ignore also errors from open/read
In reply to Jan StancekHi!
Looks good to me, acked as well.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/1 lib: make save_restore '?' prefix ignore also errors from open/read
----- Original Message -----
Quoted 2 lines
Hi!
Looks good to me, acked as well.
Pushed.