jebbatime
/
micropython
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qemu-arm: Handle sys.exit() to allow skip tests in testsuite.

stackless
Paul Sokolovsky 2015-02-28 00:31:18 +02:00
parent 992284be39
commit 562fa575a6
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qemu-arm/mpconfigport.h
View File

@ -18,6 +18,7 @@
#define MICROPY_PY_BUILTINS_FROZENSET (1)
#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
#define MICROPY_PY_IO (0)
#define MICROPY_PY_SYS_EXIT (1)
// type definitions for the specific machine

10
qemu-arm/test_main.c
View File

@ -31,7 +31,15 @@ inline void do_str(const char *src) {
mp_call_function_0(module_fun);
nlr_pop();
} else {
mp_obj_print_exception(printf_wrapper, NULL, (mp_obj_t)nlr.ret_val);
mp_obj_t exc = (mp_obj_t)nlr.ret_val;
if (mp_obj_is_subclass_fast(mp_obj_get_type(exc), &mp_type_SystemExit)) {
// Assume that sys.exit() is called to skip the test.
// TODO: That can be always true, we should set up convention to
// use specific exit code as skip indicator.
tinytest_set_test_skipped_();
return;
}
mp_obj_print_exception(printf_wrapper, NULL, exc);
tt_abort_msg("Uncaught exception");
}
end: