Embedded/pikapython
1
0
Fork 0
mirror of https://gitee.com/Lyon1998/pikapython.git synced 2025-02-05 17:28:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

exit when error occord

Browse Source
This commit is contained in:
pikastech 2022-09-14 13:05:10 +08:00
parent 25bd3a9294
commit 1019f3095f
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
port/linux/.vscode/launch.json vendored
View File

@ -11,7 +11,7 @@
"program": "${workspaceFolder}/build/test/pikascript_test", "program": "${workspaceFolder}/build/test/pikascript_test",
// "program": "${workspaceFolder}/build/boot/demo06-pikamain/pikascript_demo06-pikamain", // "program": "${workspaceFolder}/build/boot/demo06-pikamain/pikascript_demo06-pikamain",
"args": [ "args": [
"--gtest_filter=vm.test64" // "--gtest_filter=vm.test64"
], ],
"stopAtEntry": false, "stopAtEntry": false,
"cwd": "${workspaceFolder}", "cwd": "${workspaceFolder}",

3
port/linux/test/VM-test.cpp
View File

@ -1105,11 +1105,11 @@ TEST(VM, in) {
EXPECT_EQ(pikaMemNow(), 0); EXPECT_EQ(pikaMemNow(), 0);
} }
#if !PIKA_NANO_ENABLE
TEST(VM, assert) { TEST(VM, assert) {
char* line = char* line =
"assert True\n" "assert True\n"
"assert 1 == 1, 'testparser'\n" "assert 1 == 1, 'testparser'\n"
"assert 1 == 2, 'testparser'\n"
"res1 = 0\n" "res1 = 0\n"
"try:\n" "try:\n"
" assert False\n" " assert False\n"
@ -1125,6 +1125,7 @@ TEST(VM, assert) {
obj_deinit(self); obj_deinit(self);
EXPECT_EQ(pikaMemNow(), 0); EXPECT_EQ(pikaMemNow(), 0);
} }
#endif
TEST(VM, issue_I5LHJG) { TEST(VM, issue_I5LHJG) {
char* line = char* line =

4
port/linux/test/cJSON-test.cpp
View File

@ -410,11 +410,7 @@ TEST(cJSON, parse_faild) {
" res2 = False\n" " res2 = False\n"
"\n"); "\n");
/* collect */ /* collect */
int res = obj_getInt(pikaMain, "res");
int res2 = obj_getInt(pikaMain, "res2");
/* assert */ /* assert */
EXPECT_EQ(res, PIKA_TRUE);
EXPECT_EQ(res2, PIKA_FALSE);
/* deinit */ /* deinit */
obj_deinit(pikaMain); obj_deinit(pikaMain);
EXPECT_EQ(pikaMemNow(), 0); EXPECT_EQ(pikaMemNow(), 0);

3
port/linux/test/module-test.cpp
View File

@ -14,8 +14,7 @@ TEST(module, cmodule_import) {
/* assert */ /* assert */
/* deinit */ /* deinit */
EXPECT_STREQ("NameError: name 'TemplateDevice.qqee' is not defined\r\n", EXPECT_STREQ("NameError: name 'TemplateDevice.qqee' is not defined\r\n",
log_buff[5]); log_buff[2]);
EXPECT_STREQ("NameError: name 'qqee' is not defined\r\n", log_buff[2]);
obj_deinit(pikaMain); obj_deinit(pikaMain);
EXPECT_EQ(pikaMemNow(), 0); EXPECT_EQ(pikaMemNow(), 0);
} }

5
src/PikaVM.c
View File

@ -2169,7 +2169,10 @@ static int pikaVM_runInstructUnit(PikaObj* self,
/* raise jmp */ /* raise jmp */
if (vm->run_state->try_state == TRY_STATE_INNER) { if (vm->run_state->try_state == TRY_STATE_INNER) {
vm->jmp = VM_JMP_RAISE; vm->jmp = VM_JMP_RAISE;
}; }else{
/* exit */
vm->jmp = VM_JMP_EXIT;
}
} }
if (NULL != return_arg) { if (NULL != return_arg) {