Skip to content
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.

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

shelldriver: Fix xmodem #1261

Merged
merged 1 commit into from
Sep 6, 2023
Merged

Conversation

JoshuaWatt
Copy link
Contributor

xmodem was failing because it would consume the trailing newline character between the echo for the marker and the command output. Fix this by suppressing new line on the marker

Description

Checklist

  • Documentation for the feature
  • Tests for the feature
  • The arguments and description in doc/configuration.rst have been updated
  • Add a section on how to use the feature to doc/usage.rst
  • Add a section on how to use the feature to doc/development.rst
  • PR has been tested
  • Man pages have been regenerated

xmodem was failing because it would consume the trailing newline
character between the `echo` for the marker and the command output. Fix
this by suppressing new line on the marker

Signed-off-by: Joshua Watt <[email protected]>
@codecov
Copy link

codecov bot commented Aug 28, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.1% ⚠️

Comparison is base (1052d34) 62.9% compared to head (2ddca3e) 62.9%.

❗ Current head 2ddca3e differs from pull request most recent head 5eff539. Consider uploading reports for the commit 5eff539 to get more accurate results

Additional details and impacted files
@@           Coverage Diff            @@
##           master   #1261     +/-   ##
========================================
- Coverage    62.9%   62.9%   -0.1%     
========================================
  Files         161     161             
  Lines       11861   11861             
========================================
- Hits         7470    7469      -1     
- Misses       4391    4392      +1     
Files Changed Coverage Δ
labgrid/driver/shelldriver.py 27.1% <0.0%> (ø)

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Emantor
Copy link
Member

Emantor commented Sep 6, 2023

Thanks for the fix!

@Emantor Emantor merged commit 8e1e683 into labgrid-project:master Sep 6, 2023
7 of 9 checks passed
@Bastian-Krause
Copy link
Member

This should be back ported to stable.

@Bastian-Krause Bastian-Krause added fix Pick to stable Needs a pick to the stable branch labels Sep 6, 2023
@Bastian-Krause
Copy link
Member

This should be back ported to stable.

Done.

@rohieb
Copy link
Contributor

rohieb commented Jan 31, 2024

xmodem was failing because it would consume the trailing newline character between the echo for the marker and the command output. Fix this by suppressing new line on the marker

@JoshuaWatt do you still know what you were using on the target? Was it lrzsz or the busybox rx/sx tools, or something else? (I'm wondering because I didn't get it to work recently…)

@JoshuaWatt
Copy link
Contributor Author

@rohieb I'm pretty sure it was lrzsz, but it was a while ago so I'm not positive

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
fix Pick to stable Needs a pick to the stable branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants