Changeset b053083

Timestamp:

Mar 11, 2022, 10:54:10 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

4f6dda0

Parents:

cc9b520

Message:

Fixed error handling for core_info

Location:

tests

Files:

• pybin/tools.py (modified) (1 diff)
• test.py (modified) (1 diff)

tests/pybin/tools.py

@@ -486 +486 @@
 
         try:
-                return sh('gdb', '-n', path, core, '-batch', '-x', cmd, output_file=subprocess.PIPE)
+                ret, out, err = sh('gdb', '-n', path, core, '-batch', '-x', cmd, output_file=subprocess.PIPE)
+                if ret == 0:
+                        return 0, out
+                else:
+                        return 1, err
         except:
                 return 1, "ERR Could not read core with gdb"

tests/test.py

@@ -235 +235 @@
                                 error = "Output log can't be read, file is bigger than 1MB, see {} for actual error\n".format(out_file)
 
-                        ret, info, gdberr = core_info(exe_file)
-                        if ret == 0:
-                                error = error + info if error else info
-                        else :
-                                error = error + gdberr if error else gdberr
+                        ret, info = core_info(exe_file)
+                        error = error + info if error else info
 
                         if settings.archive: