Skip to content

Commit

Permalink
Merge pull request #62 from dkohlbre/dev-bumps
Browse files Browse the repository at this point in the history
Bumping submodules and updated port configs for run scripts to be >30…
  • Loading branch information
dkohlbre committed Mar 11, 2019
2 parents c964156 + 75a13b7 commit fd32be2
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion riscv-pk
Submodule riscv-pk updated 9 files
+13 −22 README.md
+323 −317 sm/enclave.c
+37 −8 sm/enclave.h
+2 −2 sm/page.c
+42 −27 sm/pmp.c
+12 −0 sm/safe_math_util.h
+4 −3 sm/sm-sbi.c
+12 −7 sm/sm.c
+2 −4 sm/sm.h
2 changes: 1 addition & 1 deletion scripts/busybear-travis.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

export HOST_PORT=${HOST_PORT:="$((2000 + RANDOM % 3000))"}
export HOST_PORT=${HOST_PORT:="$((3000 + RANDOM % 3000))"}

# Launch QEMU test
screen -L -dmS qemu ./scripts/run-busybear-qemu.sh
Expand Down
2 changes: 1 addition & 1 deletion scripts/run-busybear-qemu.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

HOST_PORT=${HOST_PORT:="$((2000 + RANDOM % 3000))"}
HOST_PORT=${HOST_PORT:="$((3000 + RANDOM % 3000))"}

echo "**** Running QEMU SSH on port ${HOST_PORT} ****\n"

Expand Down
2 changes: 1 addition & 1 deletion scripts/run-qemu.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

HOST_PORT=${HOST_PORT:="$((2000 + RANDOM % 3000))"}
HOST_PORT=${HOST_PORT:="$((3000 + RANDOM % 3000))"}

echo "**** Running QEMU SSH on port ${HOST_PORT} ****\n"

Expand Down
2 changes: 1 addition & 1 deletion scripts/travis.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

export HOST_PORT=${HOST_PORT:="$((2000 + RANDOM % 3000))"}
export HOST_PORT=${HOST_PORT:="$((3000 + RANDOM % 3000))"}

# Launch QEMU test
screen -L -dmS qemu ./scripts/run-qemu.sh
Expand Down
2 changes: 1 addition & 1 deletion sdk
Submodule sdk updated 1 files
+12 −7 lib/host/src/keystone.cpp

0 comments on commit fd32be2

Please sign in to comment.