epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merged changes from the 3.14 branch, to revno 12674

Browse Source
This commit is contained in:
Andrew Johnson
2016-10-20 15:32:06 -05:00
parent b59a60e266 ba555ee496
commit 321e87aabf
22 changed files with 389 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libCom/test/epicsTimeTest.cpp
View File

@@ -43,7 +43,7 @@ MAIN(epicsTimeTest)
const int wasteTime = 100000;
const int nTimes = 10;
testPlan(15 + nTimes * 18);
testPlan(15 + nTimes * 19);
try {
const epicsTimeStamp epochTS = {0, 0};
@@ -200,6 +200,11 @@ MAIN(epicsTimeTest)
epicsTime beginANSI = ansiDate;
testOk1(beginANSI + diff == now);
// test struct gmtm round-trip conversion
gm_tm_nano_sec ansiGmDate = begin;
epicsTime beginGMANSI = ansiGmDate;
testOk1(beginGMANSI + diff == now);
// test struct timespec round-trip conversion
struct timespec ts = begin;
epicsTime beginTS = ts;