diff --git a/src/antara_scheduler.hpp b/src/antara_scheduler.hpp index 3310e174..ecf4aca9 100644 --- a/src/antara_scheduler.hpp +++ b/src/antara_scheduler.hpp @@ -39,10 +39,8 @@ struct DeploymentSchedule_ uint32_t maxDuration; //!< store max running time of measurement const char* taskName; //!< task name of ensemble uint32_t maxDelay; - - // State Information - uint32_t startDelay; + uint32_t nextRunTime; uint32_t measurementCount; }; diff --git a/tests/examine_behavior.cpp b/tests/examine_behavior.cpp index 0f01bf7e..1fe3a293 100644 --- a/tests/examine_behavior.cpp +++ b/tests/examine_behavior.cpp @@ -19,9 +19,16 @@ class ExamineBehavior static std::unique_ptr files; static void SetUpTestSuite() { + + #if SCHEDULER_VERSION == CHARLIE_VERSION + files = std::make_unique( + "/dev/null", + "tests/no_check_outputs/charlie_actual_file_tests.log"); + #else files = std::make_unique( "/dev/null", - "tests/no_check_outputs/actual_file_tests.log"); + "tests/no_check_outputs/antara_actual_file_tests.log"); + #endif } static void TearDownTestSuite() @@ -44,8 +51,8 @@ class ExamineBehavior std::ofstream actualFile; TestInput input; - //! filename for writing actual test output - std::string actualFileName = "actual_file_tests.log"; + + //! holds test name across functions std::string testName; diff --git a/tests/scheduler_test_system.hpp b/tests/scheduler_test_system.hpp index e56f7ea4..d9717fa4 100644 --- a/tests/scheduler_test_system.hpp +++ b/tests/scheduler_test_system.hpp @@ -93,7 +93,7 @@ struct Delay { std::string taskName; //!< name of the task uint32_t iteration; - uint32_t delay; + int32_t delay; bool isBefore; };