X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fcmdline.h;h=368daaecbbbf2e18ab32b4e169ed7a9d429cc20d;hb=24d604ebd655a7e3afe584d3dc4a25f5eca372c3;hp=44fd17f92ff4f75ec484fa8e05575e114ef59373;hpb=9f3c2098e91293e4d69b1d691fbf352e440309ff;p=awesomized%2Flibmemcached diff --git a/libtest/cmdline.h b/libtest/cmdline.h index 44fd17f9..368daaec 100644 --- a/libtest/cmdline.h +++ b/libtest/cmdline.h @@ -1,28 +1,60 @@ /* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * libtest * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * Data Differential YATL (i.e. libtest) library * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. + * Copyright (C) 2012 Data Differential, http://datadifferential.com/ * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * * The names of its contributors may not be used to endorse or + * promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #pragma once #include +// http://www.gnu.org/software/automake/manual/automake.html#Using-the-TAP-test-protocol +#ifndef EXIT_SKIP +# define EXIT_SKIP 77 +#endif + +#ifndef EXIT_FATAL +# define EXIT_FATAL 99 +#endif + +#ifndef EX_NOEXEC +# define EX_NOEXEC 126 +#endif + +#ifndef EX_NOTFOUND +# define EX_NOTFOUND 127 +#endif + namespace libtest { class Application { @@ -34,9 +66,43 @@ public: enum error_t { SUCCESS= EXIT_SUCCESS, FAILURE= EXIT_FAILURE, - INVALID= 127 + UNINITIALIZED, + SIGTERM_KILLED, + UNKNOWN, + UNKNOWN_SIGNAL, + INVALID_POSIX_SPAWN= 127 }; + static const char* toString(error_t arg) + { + switch (arg) + { + case Application::SUCCESS: + return "EXIT_SUCCESS"; + + case Application::UNINITIALIZED: + return "UNINITIALIZED"; + + case Application::SIGTERM_KILLED: + return "Exit happened via SIGTERM"; + + case Application::FAILURE: + return "EXIT_FAILURE"; + + case Application::UNKNOWN_SIGNAL: + return "Exit happened via a signal which was not SIGTERM"; + + case Application::INVALID_POSIX_SPAWN: + return "127: Invalid call to posix_spawn()"; + + case Application::UNKNOWN: + default: + break; + } + + return "EXIT_UNKNOWN"; + } + class Pipe { public: Pipe(int); @@ -51,8 +117,7 @@ public: void reset(); void close(const close_t& arg); - void dup_for_spawn(const close_t& arg, - posix_spawn_file_actions_t& file_actions); + void dup_for_spawn(posix_spawn_file_actions_t& file_actions); void nonblock(); void cloexec(); @@ -73,7 +138,7 @@ public: void add_option(const std::string&, const std::string&); void add_long_option(const std::string& option_name, const std::string& option_value); error_t run(const char *args[]= NULL); - error_t wait(bool nohang= true); + Application::error_t join(); libtest::vchar_t stdout_result() const { @@ -85,6 +150,11 @@ public: return _stdout_buffer.size(); } + const char* stdout_c_str() const + { + return &_stdout_buffer[0]; + } + libtest::vchar_t stderr_result() const { return _stderr_buffer; @@ -102,7 +172,7 @@ public: std::string print(); - void use_valgrind(bool arg= true) + void use_valgrind(bool arg) { _use_valgrind= arg; } @@ -112,12 +182,12 @@ public: bool slurp(); void murder(); - void use_gdb(bool arg= true) + void use_gdb(bool arg) { _use_gdb= arg; } - void use_ptrcheck(bool arg= true) + void use_ptrcheck(bool arg) { _use_ptrcheck= arg; } @@ -134,15 +204,22 @@ public: return _pid; } + void will_fail() + { + _will_fail= true; + } + private: void create_argv(const char *args[]); void delete_argv(); + void add_to_build_argv(const char*); private: const bool _use_libtool; bool _use_valgrind; bool _use_gdb; bool _use_ptrcheck; + bool _will_fail; size_t _argc; std::string _exectuble_name; std::string _exectuble; @@ -152,37 +229,20 @@ private: Pipe stdin_fd; Pipe stdout_fd; Pipe stderr_fd; - char * * built_argv; + libtest::vchar_ptr_t built_argv; pid_t _pid; libtest::vchar_t _stdout_buffer; libtest::vchar_t _stderr_buffer; + int _status; + pthread_t _thread; + error_t _app_exit_state; }; static inline std::ostream& operator<<(std::ostream& output, const enum Application::error_t &arg) { - switch (arg) - { - case Application::SUCCESS: - output << "EXIT_SUCCESS"; - break; - - case Application::FAILURE: - output << "EXIT_FAILURE"; - break; - - case Application::INVALID: - output << "127"; - break; - - default: - output << "EXIT_UNKNOWN"; - } - - return output; + return output << Application::toString(arg); } int exec_cmdline(const std::string& executable, const char *args[], bool use_libtool= false); -const char *gearmand_binary(); - }