admin/llgo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lldb: fix shellcheck warning

Browse Source
This commit is contained in:
Li Jie
2024-09-21 21:10:06 +08:00
parent dad22b1686
commit 7b6fe0159f
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
_lldb/runtest.sh
View File

@@ -3,6 +3,7 @@
set -e set -e
# Source common functions and variables # Source common functions and variables
# shellcheck source=./_lldb/common.sh
source "$(dirname "$0")/common.sh" source "$(dirname "$0")/common.sh"
# Parse command-line arguments # Parse command-line arguments

26
_lldb/test.py
View File

@@ -79,8 +79,8 @@ class LLDBDebugger:
f'command script import "{self.plugin_path}"') f'command script import "{self.plugin_path}"')
self.target = self.debugger.CreateTarget(self.executable_path) self.target = self.debugger.CreateTarget(self.executable_path)
if not self.target: if not self.target:
raise LLDBTestException(f"Failed to create target for { raise LLDBTestException(
self.executable_path}") f"Failed to create target for {self.executable_path}")
self.debugger.HandleCommand( self.debugger.HandleCommand(
'command script add -f llgo_plugin.print_go_expression p') 'command script add -f llgo_plugin.print_go_expression p')
@@ -90,8 +90,8 @@ class LLDBDebugger:
def set_breakpoint(self, file_spec: str, line_number: int) -> lldb.SBBreakpoint: def set_breakpoint(self, file_spec: str, line_number: int) -> lldb.SBBreakpoint:
bp = self.target.BreakpointCreateByLocation(file_spec, line_number) bp = self.target.BreakpointCreateByLocation(file_spec, line_number)
if not bp.IsValid(): if not bp.IsValid():
raise LLDBTestException(f"Failed to set breakpoint at { raise LLDBTestException(
file_spec}: {line_number}") f"Failed to set breakpoint at {file_spec}: {line_number}")
return bp return bp
def run_to_breakpoint(self) -> None: def run_to_breakpoint(self) -> None:
@@ -224,8 +224,7 @@ def execute_tests(executable_path: str, test_cases: List[TestCase], verbose: boo
debugger = LLDBDebugger(executable_path, plugin_path) debugger = LLDBDebugger(executable_path, plugin_path)
try: try:
if verbose: if verbose:
log(f"Setting breakpoint at { log(f"Setting breakpoint at {test_case.source_file}: {test_case.end_line}")
test_case.source_file}: {test_case.end_line}")
debugger.setup() debugger.setup()
debugger.set_breakpoint(test_case.source_file, test_case.end_line) debugger.set_breakpoint(test_case.source_file, test_case.end_line)
debugger.run_to_breakpoint() debugger.run_to_breakpoint()
@@ -263,8 +262,7 @@ def execute_tests(executable_path: str, test_cases: List[TestCase], verbose: boo
def run_tests(executable_path: str, source_files: List[str], verbose: bool, interactive: bool, plugin_path: Optional[str]) -> None: def run_tests(executable_path: str, source_files: List[str], verbose: bool, interactive: bool, plugin_path: Optional[str]) -> None:
test_cases = parse_expected_values(source_files) test_cases = parse_expected_values(source_files)
if verbose: if verbose:
log(f"Running tests for { log(f"Running tests for {', '.join(source_files)} with {executable_path}")
', '.join(source_files)} with {executable_path}")
log(f"Found {len(test_cases)} test cases") log(f"Found {len(test_cases)} test cases")
results = execute_tests(executable_path, test_cases, results = execute_tests(executable_path, test_cases,
@@ -350,21 +348,17 @@ def print_test_result(result: TestResult, verbose: bool) -> None:
if result.status == 'pass': if result.status == 'pass':
if verbose: if verbose:
log(f"{status_symbol} Line {test.line_number}, { log(f"{status_symbol} Line {test.line_number}, {test.variable}: {status_text}")
test.variable}: {status_text}")
if test.variable == 'all variables': if test.variable == 'all variables':
log(f" Variables: {', '.join(sorted(result.actual))}") log(f" Variables: {', '.join(sorted(result.actual))}")
else: # fail or error else: # fail or error
log(f"{status_symbol} Line {test.line_number}, { log(f"{status_symbol} Line {test.line_number}, {test.variable}: {status_text}")
test.variable}: {status_text}")
if test.variable == 'all variables': if test.variable == 'all variables':
if result.missing: if result.missing:
log(f" Missing variables: { log(f" Missing variables: {', '.join(sorted(result.missing))}")
', '.join(sorted(result.missing))}")
if result.extra: if result.extra:
log(f" Extra variables: {', '.join(sorted(result.extra))}") log(f" Extra variables: {', '.join(sorted(result.extra))}")
log(f" Expected: { log(f" Expected: {', '.join(sorted(test.expected_value.split()))}")
', '.join(sorted(test.expected_value.split()))}")
log(f" Actual: {', '.join(sorted(result.actual))}") log(f" Actual: {', '.join(sorted(result.actual))}")
elif result.status == 'error': elif result.status == 'error':
log(f" Error: {result.message}") log(f" Error: {result.message}")