Skip to content

Merge branch 'master' into '6.0/stage' #228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 26, 2020
Merged

Merge branch 'master' into '6.0/stage' #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
071f330
Update `stacks` test cases
sdimitro May 26, 2020
bc14ae1
delete dead code from internal/__init__.py files
sdimitro May 26, 2020
0b125de
Merge pull request #227 from sdimitro/fix_stacks_test
sdimitro May 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions sdb/commands/internal/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,3 @@
if path != __file__:
module = os.path.splitext(os.path.basename(path))[0]
importlib.import_module("sdb.commands.internal.{}".format(module))

for path in glob.glob("{}/*/__init__.py".format(os.path.dirname(__file__))):
module = os.path.basename(os.path.dirname(path))
importlib.import_module("sdb.commands.internal.{}".format(module))
4 changes: 0 additions & 4 deletions sdb/commands/linux/internal/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,3 @@
if path != __file__:
module = os.path.splitext(os.path.basename(path))[0]
importlib.import_module("sdb.commands.linux.internal.{}".format(module))

for path in glob.glob("{}/*/__init__.py".format(os.path.dirname(__file__))):
module = os.path.basename(os.path.dirname(path))
importlib.import_module("sdb.commands.linux.internal.{}".format(module))
4 changes: 0 additions & 4 deletions sdb/commands/spl/internal/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,3 @@
if path != __file__:
module = os.path.splitext(os.path.basename(path))[0]
importlib.import_module("sdb.commands.spl.internal.{}".format(module))

for path in glob.glob("{}/*/__init__.py".format(os.path.dirname(__file__))):
module = os.path.basename(os.path.dirname(path))
importlib.import_module("sdb.commands.spl.internal.{}".format(module))
6 changes: 6 additions & 0 deletions tests/integration/data/regression_output/linux/stacks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,12 @@ TASK_STRUCT STATE COUNT
ret_from_fork+0x1f

0xffffa08966a01700 RUNNING 1
__schedule+0x2c0
schedule+0x2c
schedule_timeout+0x169
rcu_gp_kthread+0x572
kthread+0x121
ret_from_fork+0x1f

0xffffa08966a6dc00 INTERRUPTIBLE 1
__schedule+0x2c0
Expand Down
6 changes: 6 additions & 0 deletions tests/integration/data/regression_output/linux/stacks -a
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,6 +765,12 @@ TASK_STRUCT STATE
ret_from_fork+0x1f

0xffffa08966a01700 RUNNING
__schedule+0x2c0
schedule+0x2c
schedule_timeout+0x169
rcu_gp_kthread+0x572
kthread+0x121
ret_from_fork+0x1f

0xffffa08966a6dc00 INTERRUPTIBLE
__schedule+0x2c0
Expand Down