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

Point to upstream solo5/solo5 and enable solo5 tests #12

Merged
merged 4 commits into from
Jan 25, 2019
Merged

Conversation

ricarkol
Copy link
Contributor

@ricarkol ricarkol commented Jan 25, 2019

  1. Adding solo5/solo5 master repo as a submodule.
  2. Adding solo5 to runtests.sh and updated travis to run them.
  3. Now build-rr.sh builds and copies the solo5 libraries to their location. There is an objcopy to change stack guard symbols that were in conflict with the rumprun libc.
  4. The old bake rules were called ukvm-* and seccomp-*. Changed that to solo5-hvt and solo5-spt.

Ricardo Koller added 2 commits January 24, 2019 18:36
Signed-off-by: Ricardo Koller <kollerr@us.ibm.com>
@ricarkol ricarkol changed the title Solo5 tests (WIP) Solo5 tests Jan 25, 2019
@ricarkol ricarkol changed the title (WIP) Solo5 tests (WIP) Solo5 tests (on the latest upstream solo5/solo5) Jan 25, 2019
Ricardo Koller added 2 commits January 25, 2019 13:38
- Now build-rr.sh builds and copies the solo5 libraries to their location.
  There is an objcopy to change stack guard symbols that were in conflict
  with the rumprun libc.
- The old bake rules were called ukvm-* and seccomp-*. Changed that to
  solo5-hvt and solo5-spt.
- travis: using xenial ubuntu (need a newer gcc)

Signed-off-by: Ricardo Koller <kollerr@us.ibm.com>
Signed-off-by: Ricardo Koller <kollerr@us.ibm.com>
@ricarkol ricarkol changed the title (WIP) Solo5 tests (on the latest upstream solo5/solo5) Point to upstream solo5/solo5 and enable solo5 tests Jan 25, 2019
Copy link
Contributor

@sahilsuneja1 sahilsuneja1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@lumjjb lumjjb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, 1 formatting nig

@@ -200,7 +201,8 @@ checksubmodules ()
# We assume that if the git submodule command fails, it's because
# we're using external $RUMPSRC.
if git submodule status ${RUMPSRC} 2>/dev/null | grep -q '^-' \
|| git submodule status ${BUILDRUMP} 2>/dev/null | grep -q '^-';
|| git submodule status ${BUILDRUMP} 2>/dev/null | grep -q '^-' \
|| git submodule status ${SOLO5SRC} 2>/dev/null | grep -q '^-';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: allignment

Copy link
Contributor Author

@ricarkol ricarkol Jan 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ahh, that was on purpose:

        if git submodule status ${RUMPSRC} 2>/dev/null | grep -q '^-' \
            || git submodule status ${BUILDRUMP} 2>/dev/null | grep -q '^-' \
                || git submodule status ${SOLO5SRC} 2>/dev/null | grep -q '^-';

thought that this looked prettier than:

        if git submodule status ${RUMPSRC} 2>/dev/null | grep -q '^-' \
            || git submodule status ${BUILDRUMP} 2>/dev/null | grep -q '^-' \
            || git submodule status ${SOLO5SRC} 2>/dev/null | grep -q '^-';

@ricarkol ricarkol merged commit fd5045b into solo5 Jan 25, 2019
@ricarkol ricarkol deleted the solo5-tests branch February 6, 2019 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants