Merge pull request #879 from secondlife/lua-events

Lua listen_events(), await_event() => get_event_pumps(), get_event_next().

1 files changed, 4 insertions, 6 deletions

diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py
index 1f040bded5..ef4d712254 100755
--- a/indra/cmake/run_build_test.py
+++ b/indra/cmake/run_build_test.py
@@ -122,19 +122,17 @@ def main(command, arguments=[], libpath=[], vars={}):
     # Make sure we see all relevant output *before* child-process output.
     sys.stdout.flush()
     try:
-        return subprocess.call(command_list)
-    except OSError as err:
+        return subprocess.run(command_list).returncode
+    except FileNotFoundError as err:
         # If the caller is trying to execute a test program that doesn't
         # exist, we want to produce a reasonable error message rather than a
         # traceback. This happens when the build is halted by errors, but
         # CMake tries to proceed with testing anyway <eyeroll/>. However, do
         # NOT attempt to handle any error but "doesn't exist."
-        if err.errno != errno.ENOENT:
-            raise
         # In practice, the pathnames into CMake's build tree are so long as to
         # obscure the name of the test program. Just log its basename.
-        log.warn("No such program %s; check for preceding build errors" % \
-                 os.path.basename(command[0]))
+        log.warning("No such program %s; check for preceding build errors" %
+                    os.path.basename(command[0]))
         # What rc should we simulate for missing executable? Windows produces
         # 9009.
         return 9009