Remove transitional code from combine-tests.py. Issue #855
This commit is contained in:
parent
5c49e4f4e9
commit
c8fba11bd3
@ -20,7 +20,6 @@ run_pass = os.path.join(src_dir, "src", "test", "run-pass")
|
|||||||
run_pass = os.path.abspath(run_pass)
|
run_pass = os.path.abspath(run_pass)
|
||||||
stage2_tests = []
|
stage2_tests = []
|
||||||
take_args = {}
|
take_args = {}
|
||||||
take_iargs = {}
|
|
||||||
|
|
||||||
for t in os.listdir(run_pass):
|
for t in os.listdir(run_pass):
|
||||||
if t.endswith(".rs") and not (
|
if t.endswith(".rs") and not (
|
||||||
@ -32,9 +31,6 @@ for t in os.listdir(run_pass):
|
|||||||
stage2_tests.append(t)
|
stage2_tests.append(t)
|
||||||
if "main(args: [str])" in s:
|
if "main(args: [str])" in s:
|
||||||
take_args[t] = True
|
take_args[t] = True
|
||||||
# FIXME: Transitional. Remove me
|
|
||||||
if "main(args: [istr])" in s:
|
|
||||||
take_iargs[t] = True
|
|
||||||
f.close()
|
f.close()
|
||||||
|
|
||||||
stage2_tests.sort()
|
stage2_tests.sort()
|
||||||
@ -62,11 +58,9 @@ i = 0
|
|||||||
for t in stage2_tests:
|
for t in stage2_tests:
|
||||||
p = os.path.join("test", "run-pass", t)
|
p = os.path.join("test", "run-pass", t)
|
||||||
p = p.replace("\\", "\\\\")
|
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:
|
if t in take_args:
|
||||||
d.write(" t_%d::main([\"arg0\"]);\n" % i)
|
d.write(" t_%d::main([\"arg0\"]);\n" % i)
|
||||||
elif t in take_iargs:
|
|
||||||
d.write(" t_%d::main([~\"arg0\"]);\n" % i)
|
|
||||||
else:
|
else:
|
||||||
d.write(" t_%d::main();\n" % i)
|
d.write(" t_%d::main();\n" % i)
|
||||||
i += 1
|
i += 1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user