X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fcmdline.h;h=ad1d61250665ba40d6aca4ceab1e2d4ec99f3db7;hb=47f45992107361ad58c170bdf78fdc92523fab06;hp=582cb4a506369f5b4677e149a3d4c2e270231299;hpb=c87f1a554cce74ac1ba3d4e7e9c2a1d2904e4766;p=m6w6%2Flibmemcached

diff --git a/libtest/cmdline.h b/libtest/cmdline.h
index 582cb4a5..ad1d6125 100644
--- a/libtest/cmdline.h
+++ b/libtest/cmdline.h
@@ -1,8 +1,8 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  uTest
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Data Differential YATL (i.e. libtest)  library
+ *
+ *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are
@@ -36,4 +36,175 @@
 
 #pragma once
 
-bool exec_cmdline(const std::string& executable, const char *args[]);
+#include <spawn.h>
+
+namespace libtest {
+
+class Application {
+private:
+  typedef std::vector< std::pair<std::string, std::string> > Options;
+
+public:
+
+  enum error_t {
+    SUCCESS= EXIT_SUCCESS,
+    FAILURE= EXIT_FAILURE,
+    INVALID= 127
+  };
+
+  class Pipe {
+  public:
+    Pipe(int);
+    ~Pipe();
+
+    int fd();
+
+    enum close_t {
+      READ= 0,
+      WRITE= 1
+    };
+
+    void reset();
+    void close(const close_t& arg);
+    void dup_for_spawn(const close_t& arg,
+                       posix_spawn_file_actions_t& file_actions);
+
+    void nonblock();
+    void cloexec();
+    bool read(libtest::vchar_t&);
+
+  private:
+    const int _std_fd;
+    int _pipe_fd[2];
+    bool _open[2];
+  };
+
+public:
+  Application(const std::string& arg, const bool _use_libtool_arg= false);
+
+  virtual ~Application();
+
+  void add_option(const std::string&);
+  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);
+
+  libtest::vchar_t stdout_result() const
+  {
+    return _stdout_buffer;
+  }
+
+  size_t stdout_result_length() const
+  {
+    return _stdout_buffer.size();
+  }
+
+  libtest::vchar_t stderr_result() const
+  {
+    return _stderr_buffer;
+  }
+
+  const char* stderr_c_str() const
+  {
+    return &_stderr_buffer[0];
+  }
+
+  size_t stderr_result_length() const
+  {
+    return _stderr_buffer.size();
+  }
+
+  std::string print();
+
+  void use_valgrind(bool arg= true)
+  {
+    _use_valgrind= arg;
+  }
+
+  bool check() const;
+
+  bool slurp();
+  void murder();
+
+  void use_gdb(bool arg= true)
+  {
+    _use_gdb= arg;
+  }
+
+  void use_ptrcheck(bool arg= true)
+  {
+    _use_ptrcheck= arg;
+  }
+
+  std::string arguments();
+
+  std::string gdb_filename()
+  {
+    return  _gdb_filename;
+  }
+
+  pid_t pid() const
+  {
+    return _pid;
+  }
+
+  void will_fail()
+  {
+    _will_fail= true;
+  }
+
+private:
+  void create_argv(const char *args[]);
+  void delete_argv();
+
+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;
+  std::string _exectuble_with_path;
+  std::string _gdb_filename;
+  Options _options;
+  Pipe stdin_fd;
+  Pipe stdout_fd;
+  Pipe stderr_fd;
+  char * * built_argv;
+  pid_t _pid;
+  libtest::vchar_t _stdout_buffer;
+  libtest::vchar_t _stderr_buffer;
+};
+
+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;
+}
+
+int exec_cmdline(const std::string& executable, const char *args[], bool use_libtool= false);
+
+const char *gearmand_binary(); 
+const char *drizzled_binary();
+
+}