diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2017-08-17 16:58:10 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2017-08-17 16:58:10 +0300 |
| commit | 88027bf1a9144720c6611024762c1b78351e0644 (patch) | |
| tree | 26eeb20119fcd0d9a2c71c21bf4ef3a963cc7d5b | |
| parent | 6e70a37bb405ffa1f4ef37cea6d0940a056e5f57 (diff) | |
Fix incorrect printing of test failure. The former code was a logic error :(
| -rw-r--r-- | include/afio/revision.hpp | 6 | ||||
| m--------- | include/afio/v2.0/outcome | 0 | ||||
| -rw-r--r-- | programs/fs-probe/main.cpp | 6 | ||||
| m--------- | test/kerneltest | 0 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/afio/revision.hpp b/include/afio/revision.hpp index 62c49ace..ccabfa3a 100644 --- a/include/afio/revision.hpp +++ b/include/afio/revision.hpp @@ -1,4 +1,4 @@ // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time -#define AFIO_PREVIOUS_COMMIT_REF 7e0829cb4d7c4b0a80b95bb9861bb0004eabbf13 -#define AFIO_PREVIOUS_COMMIT_DATE "2017-08-17 09:39:31 +00:00" -#define AFIO_PREVIOUS_COMMIT_UNIQUE 7e0829cb +#define AFIO_PREVIOUS_COMMIT_REF 6e70a37bb405ffa1f4ef37cea6d0940a056e5f57 +#define AFIO_PREVIOUS_COMMIT_DATE "2017-08-17 13:18:35 +00:00" +#define AFIO_PREVIOUS_COMMIT_UNIQUE 6e70a37b diff --git a/include/afio/v2.0/outcome b/include/afio/v2.0/outcome -Subproject 3080f558b6eb7f20dd0163bc8cf3d00397353c7 +Subproject 22d80e68eede49b6239258af0dfc916a6540326 diff --git a/programs/fs-probe/main.cpp b/programs/fs-probe/main.cpp index 173e96f8..32d896b4 100644 --- a/programs/fs-probe/main.cpp +++ b/programs/fs-probe/main.cpp @@ -90,11 +90,11 @@ int main(int argc, char *argv[]) file_handle::io_request<file_handle::const_buffers_type> reqs(_reqs, 0); RETCHECK(testfile.write(reqs)); }; - if (std::regex_match("latency:read:qd16", torun) || std::regex_match("latency:write:qd16", torun) || std::regex_match("latency:readwrite:qd4", torun)) + if(std::regex_match("latency:read:qd16", torun) || std::regex_match("latency:write:qd16", torun) || std::regex_match("latency:readwrite:qd4", torun)) { std::cout << "Writing 17Gb of temporary test files, this will take a while ..." << std::endl; make_testfile("test"); - for (size_t n = 0; n < 16; n++) + for(size_t n = 0; n < 16; n++) make_testfile(std::to_string(n)); } else @@ -153,7 +153,7 @@ int main(int argc, char *argv[]) test.invoke([](auto &i) { std::cout << " " << i.name << " = " << i.value << std::endl; }); } else - std::cerr << " ERROR running test '" << test.name << "': " << result.error().message() << std::endl; + std::cerr << " ERROR running test '" << test.name << "': " << print(result) << std::endl; } } // Write out results for this combination of flags diff --git a/test/kerneltest b/test/kerneltest -Subproject 3067e3b39364f2f9fbfe54ec5558f2e4527c8e3 +Subproject 370b1f0c0180d1fb18a33b41252f6af2d4743bb |