##// END OF EJS Templates
run-tests: move computation of test paths into Test.__init__
Gregory Szorc -
r21338:3cd2d2de default
parent child Browse files
Show More
@@ -551,7 +551,10 b' class Test(object):'
551 runs cannot be run concurrently.
551 runs cannot be run concurrently.
552 """
552 """
553
553
554 def __init__(self, test, path, options, count, refpath, errpath):
554 def __init__(self, testdir, test, options, count, refpath):
555 path = os.path.join(testdir, test)
556 errpath = os.path.join(testdir, '%s.err' % test)
557
555 self._test = test
558 self._test = test
556 self._path = path
559 self._path = path
557 self._options = options
560 self._options = options
@@ -1134,8 +1137,6 b' def runone(options, test, count):'
1134 log("\nSkipping %s: %s" % (testpath, msg))
1137 log("\nSkipping %s: %s" % (testpath, msg))
1135 return 's', test, msg
1138 return 's', test, msg
1136
1139
1137 testpath = os.path.join(TESTDIR, test)
1138 err = os.path.join(TESTDIR, test + ".err")
1139 lctest = test.lower()
1140 lctest = test.lower()
1140
1141
1141 for ext, cls, out in testtypes:
1142 for ext, cls, out in testtypes:
@@ -1146,7 +1147,7 b' def runone(options, test, count):'
1146 else:
1147 else:
1147 return skip("unknown test type")
1148 return skip("unknown test type")
1148
1149
1149 t = runner(test, testpath, options, count, ref, err)
1150 t = runner(TESTDIR, test, options, count, ref)
1150 result = t.run()
1151 result = t.run()
1151
1152
1152 t.cleanup()
1153 t.cleanup()
General Comments 0
You need to be logged in to leave comments. Login now