diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2017-01-31 22:08:38 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2017-02-03 23:57:27 +0300 |
commit | 044e2e1c1460fb060f677a366144b98905522754 (patch) | |
tree | 4cdd67e9bca323d74cf5cc514444019a70b4de95 /build2/test/script/runner.cxx | |
parent | 31a4169c67045cfe37eed138b537930e259db1e9 (diff) |
Add sed builtin
Diffstat (limited to 'build2/test/script/runner.cxx')
-rw-r--r-- | build2/test/script/runner.cxx | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/build2/test/script/runner.cxx b/build2/test/script/runner.cxx index dcfaec9..751daec 100644 --- a/build2/test/script/runner.cxx +++ b/build2/test/script/runner.cxx @@ -5,12 +5,11 @@ #include <build2/test/script/runner> #include <set> -#include <ios> // streamsize -#include <cstring> // strstr() -#include <sstream> +#include <ios> // streamsize #include <butl/fdstream> // fdopen_mode, fdnull(), fddup() +#include <build2/regex> #include <build2/filesystem> #include <build2/test/common> @@ -21,39 +20,6 @@ using namespace std; using namespace butl; -namespace std -{ - // Print regex error description but only if it is meaningful (this is also - // why we have to print leading colon here). - // - // Currently libstdc++ just returns the name of the exception (bug #67361). - // So we check that the description contains at least one space character. - // - // While VC's description is meaningful, it has an undesired prefix that - // resembles the following: 'regex_error(error_badrepeat): '. So we skip it. - // - static ostream& - operator<< (ostream& o, const regex_error& e) - { - const char* d (e.what ()); - -#if defined(_MSC_VER) && _MSC_VER <= 1910 - const char* rd (strstr (d, "): ")); - if (rd != nullptr) - d = rd + 3; -#endif - - ostringstream os; - os << runtime_error (d); // Sanitize the description. - - string s (os.str ()); - if (s.find (' ') != string::npos) - o << ": " << s; - - return o; - } -} - namespace build2 { namespace test |