Skip to content

Commit

Permalink
minor
Browse files Browse the repository at this point in the history
  • Loading branch information
@gitting-around
gitting-around committed Sep 10, 2021
1 parent 5c5e409 commit 20cf88c
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion docker-build-all.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ git submodule update --init

./scripts/darwin64_build.sh
#./scripts/linux64_build.sh
#./scripts/win64_build.sh
./scripts/win64_build.sh

./scripts/pack_fmu.sh
14 changes: 7 additions & 7 deletions rabbitmq-core/gtestresults.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuites tests="4" failures="0" disabled="0" errors="0" time="0.001" timestamp="2021-09-08T11:39:39" name="AllTests">
<testsuite name="FmuContainerCore" tests="2" failures="0" disabled="0" errors="0" time="0.001" timestamp="2021-09-08T11:39:39">
<testcase name="Initialize1" status="run" result="completed" time="0.001" timestamp="2021-09-08T11:39:39" classname="FmuContainerCore" />
<testcase name="BasicOk" status="run" result="completed" time="0" timestamp="2021-09-08T11:39:39" classname="FmuContainerCore" />
<testsuites tests="4" failures="0" disabled="0" errors="0" time="0.001" timestamp="2021-09-10T10:09:18" name="AllTests">
<testsuite name="FmuContainerCore" tests="2" failures="0" disabled="0" errors="0" time="0.001" timestamp="2021-09-10T10:09:18">
<testcase name="Initialize1" status="run" result="completed" time="0.001" timestamp="2021-09-10T10:09:18" classname="FmuContainerCore" />
<testcase name="BasicOk" status="run" result="completed" time="0" timestamp="2021-09-10T10:09:18" classname="FmuContainerCore" />
</testsuite>
<testsuite name="FmuContainerCoreTla" tests="2" failures="0" disabled="0" errors="0" time="0" timestamp="2021-09-08T11:39:39">
<testcase name="InitOk" status="run" result="completed" time="0" timestamp="2021-09-08T11:39:39" classname="FmuContainerCoreTla" />
<testcase name="InitOkDoStepOk" status="run" result="completed" time="0" timestamp="2021-09-08T11:39:39" classname="FmuContainerCoreTla" />
<testsuite name="FmuContainerCoreTla" tests="2" failures="0" disabled="0" errors="0" time="0" timestamp="2021-09-10T10:09:18">
<testcase name="InitOk" status="run" result="completed" time="0" timestamp="2021-09-10T10:09:18" classname="FmuContainerCoreTla" />
<testcase name="InitOkDoStepOk" status="run" result="completed" time="0" timestamp="2021-09-10T10:09:18" classname="FmuContainerCoreTla" />
</testsuite>
</testsuites>
6 changes: 3 additions & 3 deletions rabbitmq-core/src/FmuContainerCore.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void FmuContainerCore::processIncoming(Predicate predicate) {
if (verbose) {
if(id == SEQNOID){
cout << "Updated state with id=" << id << " time value=" << value.second.i.i << endl;
//FmuContainerCore_LOG(fmi2Fatal, "logAll", "FmuContainerCore_LOG Updated state with id=%d value=%d",id, value.second.i.i);
//FmuContainerCore_LOG(fmi2OK, "logAll", "FmuContainerCore_LOG Updated state with id=%d value=%d",id, value.second.i.i);
}
}
}
Expand Down Expand Up @@ -313,7 +313,7 @@ void FmuContainerCore::processLookahead(Predicate predicate) {

if (verbose) {
cout << "Lookaheads:" << endl;
//FmuContainerCore_LOG(fmi2Fatal, "logAll", "FmuContainerCore_LOG Lookaheads=%s","");
//FmuContainerCore_LOG(fmi2OK, "logAll", "FmuContainerCore_LOG Lookaheads=%s","");

//FmuContainerCore_LOG(fmi2OK, "logAll", "Lookaheads:%s","");
for (auto &p : this->lookahead) {
Expand Down Expand Up @@ -345,7 +345,7 @@ void FmuContainerCore::processLookahead(Predicate predicate) {
if(id == SEQNOID){
cout << "Updated state with id=" << id << " time value=" << timeValue->second.i.i << " at iteration " << iteration << endl;

//FmuContainerCore_LOG(fmi2Fatal, "logAll", "FmuContainerCore_LOG Updated state with id=%d value=%f",id, timeValue->second.d.d);
//FmuContainerCore_LOG(fmi2OK, "logAll", "FmuContainerCore_LOG Updated state with id=%d value=%f",id, timeValue->second.d.d);

}
}
Expand Down
38 changes: 19 additions & 19 deletions rabbitmq-fmu/gtestresults.xml
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuites tests="10" failures="0" disabled="0" errors="0" time="0.033" timestamp="2021-09-08T11:39:39" name="AllTests">
<testsuite name="FmuContainerCoreTest" tests="1" failures="0" disabled="0" errors="0" time="0" timestamp="2021-09-08T11:39:39">
<testcase name="checksConvertTimeToString" status="run" result="completed" time="0" timestamp="2021-09-08T11:39:39" classname="FmuContainerCoreTest" />
<testsuites tests="10" failures="0" disabled="0" errors="0" time="0.045" timestamp="2021-09-10T10:09:18" name="AllTests">
<testsuite name="FmuContainerCoreTest" tests="1" failures="0" disabled="0" errors="0" time="0" timestamp="2021-09-10T10:09:18">
<testcase name="checksConvertTimeToString" status="run" result="completed" time="0" timestamp="2021-09-10T10:09:18" classname="FmuContainerCoreTest" />
</testsuite>
<testsuite name="FmuContainerTest" tests="1" failures="0" disabled="0" errors="0" time="0" timestamp="2021-09-08T11:39:39">
<testcase name="InitAndSim" status="run" result="completed" time="0" timestamp="2021-09-08T11:39:39" classname="FmuContainerTest" />
<testsuite name="FmuContainerTest" tests="1" failures="0" disabled="0" errors="0" time="0" timestamp="2021-09-10T10:09:18">
<testcase name="InitAndSim" status="run" result="completed" time="0" timestamp="2021-09-10T10:09:18" classname="FmuContainerTest" />
</testsuite>
<testsuite name="Rbmq" tests="2" failures="0" disabled="0" errors="0" time="0" timestamp="2021-09-08T11:39:39">
<testcase name="basicConsumer" status="run" result="skipped" time="0" timestamp="2021-09-08T11:39:39" classname="Rbmq" />
<testcase name="exampleConsumer" status="run" result="skipped" time="0" timestamp="2021-09-08T11:39:39" classname="Rbmq" />
<testsuite name="Rbmq" tests="2" failures="0" disabled="0" errors="0" time="0" timestamp="2021-09-10T10:09:18">
<testcase name="basicConsumer" status="run" result="skipped" time="0" timestamp="2021-09-10T10:09:18" classname="Rbmq" />
<testcase name="exampleConsumer" status="run" result="skipped" time="0" timestamp="2021-09-10T10:09:18" classname="Rbmq" />
</testsuite>
<testsuite name="JsonTest" tests="1" failures="0" disabled="0" errors="0" time="0" timestamp="2021-09-08T11:39:39">
<testcase name="Basic" status="run" result="completed" time="0" timestamp="2021-09-08T11:39:39" classname="JsonTest" />
<testsuite name="JsonTest" tests="1" failures="0" disabled="0" errors="0" time="0" timestamp="2021-09-10T10:09:18">
<testcase name="Basic" status="run" result="completed" time="0" timestamp="2021-09-10T10:09:18" classname="JsonTest" />
</testsuite>
<testsuite name="MessageParser" tests="1" failures="0" disabled="0" errors="0" time="0.018" timestamp="2021-09-08T11:39:39">
<testcase name="ParseTest" status="run" result="completed" time="0.018" timestamp="2021-09-08T11:39:39" classname="MessageParser" />
<testsuite name="MessageParser" tests="1" failures="0" disabled="0" errors="0" time="0.024" timestamp="2021-09-10T10:09:18">
<testcase name="ParseTest" status="run" result="completed" time="0.024" timestamp="2021-09-10T10:09:18" classname="MessageParser" />
</testsuite>
<testsuite name="ModelDescriptionParser" tests="1" failures="0" disabled="0" errors="0" time="0.005" timestamp="2021-09-08T11:39:39">
<testcase name="Basic" status="run" result="completed" time="0.005" timestamp="2021-09-08T11:39:39" classname="ModelDescriptionParser" />
<testsuite name="ModelDescriptionParser" tests="1" failures="0" disabled="0" errors="0" time="0.008" timestamp="2021-09-10T10:09:18">
<testcase name="Basic" status="run" result="completed" time="0.008" timestamp="2021-09-10T10:09:18" classname="ModelDescriptionParser" />
</testsuite>
<testsuite name="Timestamp" tests="1" failures="0" disabled="0" errors="0" time="0" timestamp="2021-09-08T11:39:39">
<testcase name="External" status="run" result="completed" time="0" timestamp="2021-09-08T11:39:39" classname="Timestamp" />
<testsuite name="Timestamp" tests="1" failures="0" disabled="0" errors="0" time="0" timestamp="2021-09-10T10:09:18">
<testcase name="External" status="run" result="completed" time="0" timestamp="2021-09-10T10:09:18" classname="Timestamp" />
</testsuite>
<testsuite name="XmlTest" tests="2" failures="0" disabled="0" errors="0" time="0.01" timestamp="2021-09-08T11:39:39">
<testcase name="Negative" status="run" result="completed" time="0.005" timestamp="2021-09-08T11:39:39" classname="XmlTest" />
<testcase name="modeldescription" status="run" result="completed" time="0.005" timestamp="2021-09-08T11:39:39" classname="XmlTest" />
<testsuite name="XmlTest" tests="2" failures="0" disabled="0" errors="0" time="0.013" timestamp="2021-09-10T10:09:18">
<testcase name="Negative" status="run" result="completed" time="0.006" timestamp="2021-09-10T10:09:18" classname="XmlTest" />
<testcase name="modeldescription" status="run" result="completed" time="0.007" timestamp="2021-09-10T10:09:18" classname="XmlTest" />
</testsuite>
</testsuites>

0 comments on commit 20cf88c

Please sign in to comment.