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

Fix #2372 TBL UT update for OSAL/CFE path length mismatch #2373

Merged
merged 1 commit into from
Dec 5, 2023

Conversation

irowebbn
Copy link
Contributor

@irowebbn irowebbn commented Jun 9, 2023

Checklist (Please check before submitting)

Describe the contribution
Fixes #2372

Testing performed
See reproduction steps from linked issue

Expected behavior changes
Tests should pass even if CFE_MISSION_MAX_PATH_LEN is less than OSAL_CONFIG_MAX_PATH_LEN

System(s) tested on

  • Hardware: Intel Xeon CPU E5-2687W v4 @ 3.00GHz
  • OS: CentOS 7
  • Versions: trunk

Additional context
Add any other context about the contribution here.

Third party code
If included, identify any third party code and provide text file of license
No third party code

Contributor Info - All information REQUIRED for consideration of pull request
Full name and company/organization/center of all contributors ("Personal" if individual work)

  • Note CLAs apply to only software contributions.

TblInfo1.LastFileLoaded, MyFilename, (long)sizeof(TblInfo1.LastFileLoaded) - 4);

int maxPathLenDiff = (int) CFE_MISSION_MAX_PATH_LEN - (int) OS_MAX_PATH_LEN;
if(maxPathLenDiff >= 0)

Check warning

Code scanning / CodeQL-security

Comparison result is always the same Warning

Comparison is always true because maxPathLenDiff >= 0.
@irowebbn irowebbn changed the title TBL UT update for OSAL/CFE path length mismatch Fix #2372 TBL UT update for OSAL/CFE path length mismatch Jun 15, 2023
@chillfig chillfig self-assigned this Nov 9, 2023
@dzbaker
Copy link
Collaborator

dzbaker commented Nov 30, 2023

@irowebbn CCB 30 November 2023: Agreed to provisionally approve. One change is needed:

maxPathLenDiff should be declared at top of function.

dzbaker added a commit that referenced this pull request Dec 5, 2023
Fix #2372 TBL UT update for OSAL/CFE path length mismatch
@dzbaker dzbaker added CCB:Approved Indicates code review and approval by community CCB and removed CCB:Provisionally-Approved labels Dec 5, 2023
dzbaker added a commit to nasa/cFS that referenced this pull request Dec 5, 2023
*Combines:*

to_lab v2.5.0-rc4+dev71
ci_lab v2.5.0-rc4+dev77
cFE v7.0.0-rc4+dev427
PSP v1.6.0-rc4+dev102
osal v6.0.0-rc4+dev243

**Includes:**

*to_lab*
- nasa/to_lab#173

*ci_lab*
- nasa/ci_lab#157
- nasa/ci_lab#159
- nasa/ci_lab#161

*cFE*
- nasa/cFE#2411
- nasa/cFE#2409
- nasa/cFE#2373
- nasa/cFE#2466
- nasa/cFE#2468
- nasa/cFE#2470

*PSP*
- nasa/PSP#421

*osal*
- nasa/osal#1413

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Isaac Rowe <irowebbn@users.noreply.github.com>
Co-authored by: Jacob Hageman <skliper@users.noreply.github.com>
Co-authored by: Frank Kühndel <frank-kue@users.noreply.github.com>
@dzbaker dzbaker mentioned this pull request Dec 5, 2023
2 tasks
dzbaker added a commit to nasa/cFS that referenced this pull request Dec 5, 2023
*Combines:*

to_lab v2.5.0-rc4+dev71
ci_lab v2.5.0-rc4+dev77
cFE v7.0.0-rc4+dev424
PSP v1.6.0-rc4+dev102
osal v6.0.0-rc4+dev243

**Includes:**

*to_lab*
- nasa/to_lab#173

*ci_lab*
- nasa/ci_lab#157
- nasa/ci_lab#159
- nasa/ci_lab#161

*cFE*
- nasa/cFE#2409
- nasa/cFE#2373
- nasa/cFE#2466
- nasa/cFE#2468
- nasa/cFE#2470

*PSP*
- nasa/PSP#421

*osal*
- nasa/osal#1413

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Isaac Rowe <irowebbn@users.noreply.github.com>
Co-authored by: Jacob Hageman <skliper@users.noreply.github.com>
Co-authored by: Frank Kühndel <frank-kue@users.noreply.github.com>
@dzbaker dzbaker merged commit 93c636f into nasa:main Dec 5, 2023
21 of 22 checks passed
dzbaker added a commit to nasa/cFS that referenced this pull request Dec 5, 2023
*Combines:*

to_lab v2.5.0-rc4+dev71
ci_lab v2.5.0-rc4+dev77
cFE v7.0.0-rc4+dev424
PSP v1.6.0-rc4+dev102
osal v6.0.0-rc4+dev243

**Includes:**

*to_lab*
- nasa/to_lab#173

*ci_lab*
- nasa/ci_lab#157
- nasa/ci_lab#159
- nasa/ci_lab#161

*cFE*
- nasa/cFE#2409
- nasa/cFE#2373
- nasa/cFE#2466
- nasa/cFE#2468
- nasa/cFE#2470

*PSP*
- nasa/PSP#421

*osal*
- nasa/osal#1413

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Isaac Rowe <irowebbn@users.noreply.github.com>
Co-authored by: Jacob Hageman <skliper@users.noreply.github.com>
Co-authored by: Frank Kühndel <frank-kue@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB Equuleus-rc2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OSAL path length variables cause TBL tests to fail
3 participants