diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-09-02 16:45:53 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-09-02 22:11:46 -0700 |
| commit | c8fba11bd368370be47ef610e7492cac3f2dc33c (patch) | |
| tree | 0ccccc91c177dfb8cd78edb3b1a09d7b340383fb /src/etc/combine-tests.py | |
| parent | 5c49e4f4e92997869de1f75f9089c9db7e7a6ebe (diff) | |
| download | rust-c8fba11bd368370be47ef610e7492cac3f2dc33c.tar.gz rust-c8fba11bd368370be47ef610e7492cac3f2dc33c.zip | |
Remove transitional code from combine-tests.py. Issue #855
Diffstat (limited to 'src/etc/combine-tests.py')
| -rwxr-xr-x | src/etc/combine-tests.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/etc/combine-tests.py b/src/etc/combine-tests.py index 05c9d6dd3f2..163004c4605 100755 --- a/src/etc/combine-tests.py +++ b/src/etc/combine-tests.py @@ -20,7 +20,6 @@ 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 ( @@ -32,9 +31,6 @@ 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() @@ -62,11 +58,9 @@ i = 0 for t in stage2_tests: p = os.path.join("test", "run-pass", t) p = p.replace("\\", "\\\\") - d.write(" out.write_str(~\"run-pass [stage2]: %s\\n\");\n" % p) + 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 |