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

4 files changed, 36 insertions, 10 deletions

diff --git a/test/AS/AS.py b/test/AS/AS.py
index 38ea655..e0ffbf4 100644
--- a/test/AS/AS.py
+++ b/test/AS/AS.py
@@ -47,7 +47,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:]
@@ -65,15 +69,16 @@ 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 not a[0] in "/-":
         if not inf:
             inf = a
         continue
     if a[:3] == '/Fo': out = a[3:]
-    if a == '-o':
-        out = args[0]
-        args = args[1:]
 infile = open(inf, 'rb')
 outfile = open(out, 'wb')
 for l in infile.readlines():
diff --git a/test/AS/ASFLAGS.py b/test/AS/ASFLAGS.py
index 4f89c2c..024cea3 100644
--- a/test/AS/ASFLAGS.py
+++ b/test/AS/ASFLAGS.py
@@ -45,7 +45,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:]
@@ -64,6 +68,10 @@ inf = None
 optstring = ''
 while args:
     a = args[0]
+    if a == '-o':
+        out = args[1]
+        args = args[2:]
+        continue
     args = args[1:]
     if not a[0] in '/-':
         if not inf:
diff --git a/test/AS/ASPP.py b/test/AS/ASPP.py
index db699f8..67f4071 100644
--- a/test/AS/ASPP.py
+++ b/test/AS/ASPP.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,15 +64,16 @@ 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 not a[0] in "/-":
         if not inf:
             inf = a
         continue
     if a[:3] == '/Fo': out = a[3:]
-    if a == '-o':
-        out = args[0]
-        args = args[1:]
 infile = open(inf, 'rb')
 outfile = open(out, 'wb')
 for l in infile.readlines():
diff --git a/test/AS/ASPPFLAGS.py b/test/AS/ASPPFLAGS.py
index f27d0ad..f8e70a9 100644
--- a/test/AS/ASPPFLAGS.py
+++ b/test/AS/ASPPFLAGS.py
@@ -45,7 +45,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:]
@@ -64,6 +68,10 @@ inf = None
 optstring = ''
 while args:
     a = args[0]
+    if a == '-o':
+        out = args[1]
+        args = args[2:]
+        continue
     args = args[1:]
     if not a[0] in '/-':
         if not inf: