[LTP] [PATCH 3/4] newlib: Allow SAFE_MACROS to be called from cleanup
Cyril Hrubis
chrubis@suse.cz
Tue Feb 14 13:26:38 CET 2017
Which is done by:
* Dropping attribute ((noreturn)) from all tst_brk_() definitions so
that the function could actually return in case it's called from
cleanup.
* Adding brk handler to tst_test.c so that we can temporarily replace
the tst_brk_() function with function that maps TBROK to TWARN and
calls tst_vres_().
+ updated test-writing-guidelines
+ testcase
Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
doc/test-writing-guidelines.txt | 11 ++++------
include/tst_test.h | 3 +--
lib/ltp_priv.h | 2 +-
lib/newlib_tests/.gitignore | 1 +
lib/newlib_tests/test14.c | 45 +++++++++++++++++++++++++++++++++++++++++
lib/tst_test.c | 23 +++++++++++++++++++--
6 files changed, 73 insertions(+), 12 deletions(-)
create mode 100644 lib/newlib_tests/test14.c
diff --git a/doc/test-writing-guidelines.txt b/doc/test-writing-guidelines.txt
index 41cee58..cec4bdc 100644
--- a/doc/test-writing-guidelines.txt
+++ b/doc/test-writing-guidelines.txt
@@ -341,9 +341,6 @@ cleanup() callback.
initialized. (Some of the steps may not depend on others and everything
will work if there were swapped but let's keep it in order.)
-3. Avoid using SAFE_MACROS() in cleanup if you want the cleanup to carry on
- when a cleanup step has failed.
-
The first rule may seem complicated at first however, on the contrary, it's
quite easy. All you have to do is to keep track of what was already
initialized. For example file descriptors needs to be closed only if they were
@@ -381,11 +378,11 @@ requires extra flag to be set after device was successfully mounted.
-------------------------------------------------------------------------------
static void cleanup(void)
{
- if (fd1 > 0 && close(fd1))
- tst_res(TWARN | TERRNO, "close(fd1)");
+ if (fd1 > 0)
+ SAFE_CLOSE(fd1);
- if (fd0 > 0 && close(fd0))
- tst_res(TWARN | TERRNO, "close(fd0)");
+ if (fd0 > 0)
+ SAFE_CLOSE(fd0);
if (mount_flag && tst_umouont(MNTPOINT))
tst_res(TBROK | TERRNO, "umount(%s)", MNTPOINT);
diff --git a/include/tst_test.h b/include/tst_test.h
index d8cc806..1ed39db 100644
--- a/include/tst_test.h
+++ b/include/tst_test.h
@@ -62,8 +62,7 @@ void tst_resm_hexd_(const char *file, const int lineno, int ttype,
*/
void tst_brk_(const char *file, const int lineno, int ttype,
const char *fmt, ...)
- __attribute__ ((format (printf, 4, 5)))
- __attribute__ ((noreturn));
+ __attribute__ ((format (printf, 4, 5)));
#define tst_brk(ttype, arg_fmt, ...) \
tst_brk_(__FILE__, __LINE__, (ttype), (arg_fmt), ##__VA_ARGS__)
diff --git a/lib/ltp_priv.h b/lib/ltp_priv.h
index de45e4a..e678a28 100644
--- a/lib/ltp_priv.h
+++ b/lib/ltp_priv.h
@@ -59,7 +59,7 @@ void tst_vbrk_(const char *file, const int lineno, int ttype,
const char *fmt, va_list va) __attribute__((noreturn));
void tst_brk_(const char *file, const int lineno, int ttype,
- const char *msg, ...) __attribute__((noreturn));
+ const char *msg, ...);
void tst_vres_(const char *file, const int lineno, int ttype,
const char *fmt, va_list va);
diff --git a/lib/newlib_tests/.gitignore b/lib/newlib_tests/.gitignore
index bc2409c..8e12007 100644
--- a/lib/newlib_tests/.gitignore
+++ b/lib/newlib_tests/.gitignore
@@ -11,6 +11,7 @@ test10
test11
test12
test13
+test14
tst_device
tst_safe_fileops
tst_res_hexd
diff --git a/lib/newlib_tests/test14.c b/lib/newlib_tests/test14.c
new file mode 100644
index 0000000..4d94978
--- /dev/null
+++ b/lib/newlib_tests/test14.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016 Cyril Hrubis <chrubis@suse.cz>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "tst_test.h"
+#include "tst_safe_stdio.h"
+#include "tst_safe_net.h"
+
+static void cleanup(void)
+{
+ int i;
+
+ tst_brk(TBROK, "TBROK in cleanup");
+ SAFE_OPEN("foo", O_RDWR);
+ SAFE_FILE_SCANF("foo", "%i", &i);
+ SAFE_TOUCH("doo/foo", 0777, NULL);
+ SAFE_FOPEN("foo", "r");
+ SAFE_SOCKET(AF_UNIX, SOCK_STREAM, -1);
+ tst_res(TINFO, "Test still here");
+}
+
+static void do_test(void)
+{
+ tst_res(TPASS, "Passed");
+}
+
+static struct tst_test test = {
+ .tid = "test14",
+ .test_all = do_test,
+ .cleanup = cleanup,
+};
diff --git a/lib/tst_test.c b/lib/tst_test.c
index 8e24a94..f0f2c24 100644
--- a/lib/tst_test.c
+++ b/lib/tst_test.c
@@ -239,12 +239,31 @@ void tst_vres_(const char *file, const int lineno, int ttype,
}
void tst_vbrk_(const char *file, const int lineno, int ttype,
- const char *fmt, va_list va) __attribute__((noreturn));
+ const char *fmt, va_list va);
+
+static void (*tst_brk_handler)(const char *file, const int lineno, int ttype,
+ const char *fmt, va_list va) = tst_vbrk_;
+
+static void tst_cvres(const char *file, const int lineno, int ttype,
+ const char *fmt, va_list va)
+{
+ if (TTYPE_RESULT(ttype) == TBROK) {
+ ttype &= ~TTYPE_MASK;
+ ttype |= TWARN;
+ }
+
+ print_result(file, lineno, ttype, fmt, va);
+ update_results(TTYPE_RESULT(ttype));
+}
static void do_test_cleanup(void)
{
+ tst_brk_handler = tst_cvres;
+
if (tst_test->cleanup)
tst_test->cleanup();
+
+ tst_brk_handler = tst_vbrk_;
}
void tst_vbrk_(const char *file, const int lineno, int ttype,
@@ -277,7 +296,7 @@ void tst_brk_(const char *file, const int lineno, int ttype,
va_list va;
va_start(va, fmt);
- tst_vbrk_(file, lineno, ttype, fmt, va);
+ tst_brk_handler(file, lineno, ttype, fmt, va);
va_end(va);
}
--
2.10.2
More information about the ltp
mailing list