Merge branch 'development' into gaisser_compiler_flags
fsfw/fsfw/pipeline/pr-development This commit looks good Details

This commit is contained in:
Steffen Gaisser 2022-03-07 13:09:21 +01:00
commit 14b44f8bb2
4 changed files with 7 additions and 4 deletions

View File

@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
# [v5.0.0] # [v5.0.0]
## Changes
- `oneShotAction` flag in the `TestTask` class is not static anymore
## Removed ## Removed
- Removed the `HkSwitchHelper`. This module should not be needed anymore, now that the local - Removed the `HkSwitchHelper`. This module should not be needed anymore, now that the local

View File

@ -21,14 +21,14 @@ pipeline {
stage('Build') { stage('Build') {
steps { steps {
dir(BUILDDIR) { dir(BUILDDIR) {
sh 'cmake --build . -j' sh 'cmake --build . -j4'
} }
} }
} }
stage('Unittests') { stage('Unittests') {
steps { steps {
dir(BUILDDIR) { dir(BUILDDIR) {
sh 'cmake --build . -- fsfw-tests_coverage -j' sh 'cmake --build . -- fsfw-tests_coverage -j4'
} }
} }
} }

View File

@ -3,7 +3,6 @@
#include <fsfw/objectmanager/ObjectManager.h> #include <fsfw/objectmanager/ObjectManager.h>
#include <fsfw/serviceinterface/ServiceInterface.h> #include <fsfw/serviceinterface/ServiceInterface.h>
bool TestTask::oneShotAction = true;
MutexIF* TestTask::testLock = nullptr; MutexIF* TestTask::testLock = nullptr;
TestTask::TestTask(object_id_t objectId) : SystemObject(objectId), testMode(testModes::A) { TestTask::TestTask(object_id_t objectId) : SystemObject(objectId), testMode(testModes::A) {

View File

@ -29,7 +29,7 @@ class TestTask : public SystemObject, public ExecutableObjectIF, public HasRetur
bool testFlag = false; bool testFlag = false;
private: private:
static bool oneShotAction; bool oneShotAction = true;
static MutexIF* testLock; static MutexIF* testLock;
StorageManagerIF* IPCStore; StorageManagerIF* IPCStore;
}; };