about summary refs log tree commit diff
path: root/src/etc/combine-tests.py
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2011-08-30 18:33:22 -0700
committerBrian Anderson <andersrb@gmail.com>2011-08-30 23:57:09 -0700
commitbe2ad97a610a46a33ee3a32f1e5302c9f41d94a4 (patch)
treede55416e9b93ae0075259a9ef5f096e94ba39672 /src/etc/combine-tests.py
parent4007006574561280139659a42000321020d589ff (diff)
downloadrust-be2ad97a610a46a33ee3a32f1e5302c9f41d94a4.tar.gz
rust-be2ad97a610a46a33ee3a32f1e5302c9f41d94a4.zip
Allow main to take istrs. Issue #855
Diffstat (limited to 'src/etc/combine-tests.py')
-rwxr-xr-xsrc/etc/combine-tests.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/etc/combine-tests.py b/src/etc/combine-tests.py
index c6656014525..26b20f1f8bc 100755
--- a/src/etc/combine-tests.py
+++ b/src/etc/combine-tests.py
@@ -20,6 +20,7 @@ run_pass = os.path.join(src_dir, "src", "test", "run-pass")
 run_pass = os.path.abspath(run_pass)
 stage2_tests = []
 take_args = {}
+take_iargs = {}
 
 for t in os.listdir(run_pass):
     if t.endswith(".rs") and not (
@@ -31,6 +32,9 @@ for t in os.listdir(run_pass):
             stage2_tests.append(t)
             if "main(args: [str])" in s:
                 take_args[t] = True
+            # FIXME: Transitional. Remove me
+            if "main(args: [istr])" in s:
+                take_iargs[t] = True
         f.close()
 
 stage2_tests.sort()
@@ -61,6 +65,8 @@ for t in stage2_tests:
     d.write("    out.write_str(~\"run-pass [stage2]: %s\\n\");\n" % p)
     if t in take_args:
         d.write("    t_%d::main([\"arg0\"]);\n" % i)
+    elif t in take_iargs:
+        d.write("    t_%d::main([~\"arg0\"]);\n" % i)
     else:
         d.write("    t_%d::main();\n" % i)
     i += 1