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

Integration Candidate: 2020-04-22 #440

Merged
merged 12 commits into from
May 1, 2020
Merged

Integration Candidate: 2020-04-22 #440

merged 12 commits into from
May 1, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Apr 28, 2020

Describe the contribution
Integration Candidate 2020-04-22

Fixes: #262, #344, #424, #346, #430, and #425

Testing performed
CI - https://github.com/nasa/osal/pull/440/checks?check_run_id=633931133
Bundle CI- https://github.com/nasa/cFS/pull/74/checks?check_run_id=637311464
See PRs for other tests

Expected behavior changes

  1. PR Fix #346, Adds library build, functional, and coverage test to CI #403 - Adds library build, functional, and coverage test to CI
  2. PR Fix #262, Deprecates OS_FS_* defines that aren't unique to FS #421 - Deprecates OS_FS_SUCCESS, OS_FS_ERROR , OS_FS_ERR_INVALID_POINTER, OS_FS_ERR_NO_FREE_FDS , OS_FS_ERR_INVALID_FD, and OS_FS_UNIMPLEMENTED from from osapi-os-filesys.h
  3. PR Fix #344, Consistent directory entry size limit #423 - Individual directory names now limited to OS_MAX_FILE_NAME
  4. PR Fix #425, Correct Test_OS_ConvertToArrayIndex assertion typo #428 - Fix tautology, local_idx1 is now compared with local_idx2
  5. PR Fix #430, unit-tests/osloader-test: make modules always be built for the test #431 - Module files are generated when the osal_loader_UT test is built and run
  6. PR Fix #424, Add looping wait for self exiting task #426 - Consistent osal-core-test execution status

System(s) tested on
CI - Ubuntu:Bionic

Additional context
Part of nasa/cFS#74

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

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman, NASA-GSFC
Dan Knutsen, NASA/Goddard
Yasir Khan, NASA-GSFC
Stanislav Pankevich, PTS GmbH

yammajamma and others added 11 commits April 20, 2020 14:51
…n-Fix

Fix #425, Correct Test_OS_ConvertToArrayIndex assertion typo
Fix #346, Adds library build, functional, and coverage test to CI
Fix #424, Add looping wait for self exiting task
unit-tests/osloader-test: make modules always be built for the test
Changes FileName in os_dirent_t from OS_MAX_PATH_LEN to OS_MAX_FILE_NAME,
and moves OS_check_name_length into OS_TranslatePath so it is
consistantly applied everywhere. Also fixes the length checks in
OS_check_name_length to account for terminating null.

Unit tests updated to match new directory name limit.  Coverage
tests updated to match simplified logic.
Fix #344, Consistent directory entry size limit
@jphickey
Copy link
Contributor

FYI - I'm getting some testing failures when running this IC, which may be related to the size changes in #344 / PR #423. Investigating....

@jphickey
Copy link
Contributor

Not sure why that commit was cherry-picked .... this integration is still wrong in many ways. There are still a lot of conflicts with the OS_FS_* error code changes and the file restructures to handle the shell, etc etc. There is a lot broken in the current IC.

The original rebase of #285 (in IC commit 1431232) is simply incorrect. The commit 101862e has all of this stuff fixed - I already worked out all of these issues.

@jphickey
Copy link
Contributor

ALTERNATE PROPOSAL -- lets just cancel #427 entirely and merge the rest of 2020-04-22 baseline to master. I will then submit a NEW pull request which contains the rebased #285 which I know works and I have tested. The rebased version in this IC is NOT correct and should NOT be merged.

@astrogeco astrogeco force-pushed the integration-candidate branch from fffaad4 to a67ad31 Compare April 30, 2020 16:37
@astrogeco astrogeco marked this pull request as ready for review May 1, 2020 19:23
@astrogeco astrogeco merged commit a721bfc into master May 1, 2020
@skliper skliper added this to the 5.1.0 milestone Jun 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants