diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2017-07-28 04:33:01 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2017-07-28 04:33:01 +0300 |
| commit | 0665f2664d1d31ee130de477e3eda615a5baf0f3 (patch) | |
| tree | aa6ae857884a00a536410d02e0f4b6ef5c72e9cb /test/tests/map_handle_create_close | |
| parent | 08b8ab59b694652fcdbcad58c0f7c2a6015ae28e (diff) | |
Lots more fixes, test/shared_fs_mutex.cpp is now compiling. The rest is not.
Diffstat (limited to 'test/tests/map_handle_create_close')
| -rw-r--r-- | test/tests/map_handle_create_close/runner.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/test/tests/map_handle_create_close/runner.cpp b/test/tests/map_handle_create_close/runner.cpp index 6b1b76e7..e9ccfd0d 100644 --- a/test/tests/map_handle_create_close/runner.cpp +++ b/test/tests/map_handle_create_close/runner.cpp @@ -70,7 +70,7 @@ template <class U> inline void map_handle_create_close_(U &&f) if (use_file_backing) { // Create a temporary backing file - temph = file_handle::file("tempfile", file_handle::mode::write, file_handle::creation::if_needed).get(); + temph = file_handle::file({}, "tempfile", file_handle::mode::write, file_handle::creation::if_needed).value(); temph.write(0, "I am some file data", 19).get(); } else @@ -95,26 +95,26 @@ template <class U> inline void map_handle_create_close_(U &&f) { char *addr = maph.address(); section_handle::flag flags = std::get<1>(std::get<1>(permuter[idx])); - BOOST_KERNELTEST_CHECK(testreturn, maph.length() > 0); - BOOST_KERNELTEST_CHECK(testreturn, addr != nullptr); + KERNELTEST_CHECK(testreturn, maph.length() > 0); + KERNELTEST_CHECK(testreturn, addr != nullptr); if (!(flags & section_handle::flag::nocommit)) { char buffer[64]; // Make sure the backing file is appearing in the map if (use_file_backing && maph.is_readable()) { - BOOST_KERNELTEST_CHECK(testreturn, !memcmp(addr, "I am some file data", 19)); + KERNELTEST_CHECK(testreturn, !memcmp(addr, "I am some file data", 19)); } // Make sure maph's read() does what it is supposed to { - auto b = maph.read(0, nullptr, 20).get(); - BOOST_KERNELTEST_CHECK(testreturn, b.first == addr); - BOOST_KERNELTEST_CHECK(testreturn, b.second == 20); + auto b = maph.read(0, nullptr, 20).value(); + KERNELTEST_CHECK(testreturn, b.first == addr); + KERNELTEST_CHECK(testreturn, b.second == 20); } { - auto b = maph.read(5, nullptr, 5000).get(); - BOOST_KERNELTEST_CHECK(testreturn, b.first == addr+5); - BOOST_KERNELTEST_CHECK(testreturn, b.second == 4091); + auto b = maph.read(5, nullptr, 5000).value(); + KERNELTEST_CHECK(testreturn, b.first == addr+5); + KERNELTEST_CHECK(testreturn, b.second == 4091); } // If we are writable, write straight into the map if (maph.is_writable() && addr) @@ -128,18 +128,18 @@ template <class U> inline void map_handle_create_close_(U &&f) temph.read(0, buffer, 64); if (flags & section_handle::flag::cow) { - BOOST_KERNELTEST_CHECK(testreturn, !memcmp(buffer, "I am some file data", 19)); + KERNELTEST_CHECK(testreturn, !memcmp(buffer, "I am some file data", 19)); } else { - BOOST_KERNELTEST_CHECK(testreturn, !memcmp(buffer, "Niall was here data", 19)); + KERNELTEST_CHECK(testreturn, !memcmp(buffer, "Niall was here data", 19)); } } } // The OS should not auto expand storage to 4Kb if (use_file_backing) { - BOOST_KERNELTEST_CHECK(testreturn, temph.length().get() == 19); + KERNELTEST_CHECK(testreturn, temph.length().value() == 19); } } } |