#6153 Make hardware test more robust

2 files changed, 9 insertions, 0 deletions

diff --git a/indra/llcommon/llprocess.cpp b/indra/llcommon/llprocess.cpp
index e43f386af2..86e1f48377 100644
--- a/indra/llcommon/llprocess.cpp
+++ b/indra/llcommon/llprocess.cpp
@@ -1109,6 +1109,11 @@ bool LLProcess::kill(const LLProcessPtr& ptr, const std::string& who)
     return !ptr || ptr->kill(who);
 }
 
+void LLProcess::pump()
+{
+    tick();
+}
+
 LLProcess::id LLProcess::getProcessID() const
 {
     if (!mChild)
diff --git a/indra/llcommon/llprocess.h b/indra/llcommon/llprocess.h
index 26f9a27837..a016b6a258 100644
--- a/indra/llcommon/llprocess.h
+++ b/indra/llcommon/llprocess.h
@@ -234,6 +234,10 @@ public:
     bool kill(const std::string& who = "");
     static bool kill(const LLProcessPtr& p, const std::string& who = "");
 
+    /// Manually drive pending I/O and check process state.
+    /// Use this when the mainloop is not yet running or was terminated.
+    void pump();
+
 #if LL_WINDOWS
     typedef int id;
     typedef HANDLE handle;