Skip to content
Snippets Groups Projects

[TimeoutTest] fix timeout return assertion for linux 5.16

Merged Florian Fischer requested to merge aj46ezos/emper:fix-timeout-test-linux-5.16 into master
1 unresolved thread
1 file
+ 4
1
Compare changes
  • Side-by-side
  • Inline
+ 4
1
@@ -7,6 +7,7 @@
@@ -7,6 +7,7 @@
#include <cerrno>
#include <cerrno>
#include <cstdint>
#include <cstdint>
#include <cstring>
#include <cstring>
 
#include <memory>
Please register or sign in to reply
#include "Common.hpp"
#include "Common.hpp"
#include "CountingPrivateSemaphore.hpp"
#include "CountingPrivateSemaphore.hpp"
@@ -15,6 +16,7 @@
@@ -15,6 +16,7 @@
#include "emper.hpp"
#include "emper.hpp"
#include "fixtures/assert.hpp"
#include "fixtures/assert.hpp"
#include "io.hpp"
#include "io.hpp"
 
#include "lib/LinuxVersion.hpp"
using emper::io::ReadFuture;
using emper::io::ReadFuture;
using emper::io::TimeoutWrapper;
using emper::io::TimeoutWrapper;
@@ -122,7 +124,8 @@ void writeTest() {
@@ -122,7 +124,8 @@ void writeTest() {
ASSERT(res == -1);
ASSERT(res == -1);
// write requests can't be canceled when in execution so this
// write requests can't be canceled when in execution so this
// will return as interupted
// will return as interupted
ASSERT(errno == EINTR);
const int err = errno;
 
ASSERT(err == EINTR || (EMPER_LINUX_GE("5.16.0") && err == ECANCELED));
emper::io::closeAndForget(efd);
emper::io::closeAndForget(efd);
}
}
Loading