diff --git a/.gitignore b/.gitignore index 0f32a7a8..f0f562f0 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ build support/nos3_install.log tmp core.* +.cdskeyfile +.reservedkeyfile +.resetkeyfile diff --git a/Makefile b/Makefile index 84847472..4d106a14 100644 --- a/Makefile +++ b/Makefile @@ -122,6 +122,7 @@ test-fsw: mkdir -p $(FSWBUILDDIR) cd $(FSWBUILDDIR) && cmake $(PREP_OPTS) -DENABLE_UNIT_TESTS=true ../cfe $(MAKE) --no-print-directory -C $(FSWBUILDDIR) mission-install + cd $(FSWBUILDDIR)/amd64-linux-gnu/default_cpu1 && ctest -O ctest.log igniter: ./scripts/igniter_launch.sh diff --git a/fsw/osal b/fsw/osal index 570ad091..452824c4 160000 --- a/fsw/osal +++ b/fsw/osal @@ -1 +1 @@ -Subproject commit 570ad0913daf57ad2a62c92f6a0daef5a94f72ba +Subproject commit 452824c4fa54cf956c5ac745ea6db6773c72cc60 diff --git a/scripts/docker_debug.sh b/scripts/docker_debug.sh index 87c541a7..05f479db 100755 --- a/scripts/docker_debug.sh +++ b/scripts/docker_debug.sh @@ -9,4 +9,4 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source $SCRIPT_DIR/env.sh mkdir -p $BASE_DIR/fsw/build -$DFLAGS_CPUS -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -w $BASE_DIR --name "nos3_debug" $DBOX bash +$DFLAGS_CPUS -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -w $BASE_DIR --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice --name "nos3_debug" $DBOX bash