- first swoop of changes for getting all Buildbot slaves to run successfully again

1 files changed, 10 insertions, 2 deletions

diff --git a/test/CXX/CXX.py b/test/CXX/CXX.py
index 1e338a65..cd354ae7 100644
--- a/test/CXX/CXX.py
+++ b/test/CXX/CXX.py
@@ -42,7 +42,11 @@ import sys
 args = sys.argv[1:]
 while args:
     a = args[0]
-    if a[0] != '/':
+    if a == '-o':
+        out = args[1]
+        args = args[2:]
+        continue
+    if not a[0] in '/-':
         break
     args = args[1:]
     if a[:5].lower() == '/out:': out = a[5:]
@@ -60,8 +64,12 @@ args = sys.argv[1:]
 inf = None
 while args:
     a = args[0]
+    if a == '-o':
+        out = args[1]
+        args = args[2:]
+        continue
     args = args[1:]
-    if a[0] != '/':
+    if not a[0] in '/-':
         if not inf:
             inf = a
         continue