No bug - Fix a few issues in importTestsuite.py and update generated Makefiles; r=me

This commit is contained in:
Ms2ger 2012-04-14 15:05:33 +02:00
parent 2a2428bca8
commit 03dac80635
4 changed files with 8 additions and 7 deletions

View File

@ -24,7 +24,7 @@ _SUPPORT_FILES = \
WebIDLParser.js \
$(NULL)
testharnessreport.js: testharnessreport.js.in writeReporter.py
testharnessreport.js: testharnessreport.js.in writeReporter.py html.json webapps.json
$(PYTHON_PATH) $(srcdir)/writeReporter.py $<
libs:: $(_SUPPORT_FILES)

View File

@ -1,4 +1,4 @@
# THIS FILE IS AUTOGENERATED - DO NOT EDIT
# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
DEPTH = ../../../../../../../..

View File

@ -53,11 +53,12 @@ def copy(thissrcdir, dest, directories):
print "Copying %s..." % (directories, )
for d in directories:
dirtocreate = dest
os.makedirs(d)
subdirs, mochitests, supportfiles = parseManifestFile(dest, d)
sourcedir = "hg-%s/%s" % (dest, d)
destdir = "%s/%s" % (dest, d)
os.makedirs(destdir)
for mochitest in mochitests:
shutil.copy("%s/%s" % (sourcedir, mochitest), "%s/test_%s" % (destdir, mochitest))
for support in supportfiles:
@ -139,9 +140,9 @@ def printMakefiles(thissrcdir, dest, directories):
def hgadd(dest, directories):
"""Inform hg of the files in |directories|."""
print "hg adding..."
print "hg addremoving..."
for d in directories:
subprocess.check_call(["hg", "add", "%s/%s" % (dest, d)])
subprocess.check_call(["hg", "addremove", "%s/%s" % (dest, d)])
def importDirs(thissrcdir, dest, directories):
copy(thissrcdir, dest, directories)
@ -170,7 +171,7 @@ def importRepo(confFile, thissrcdir):
print "Done"
if __name__ == "__main__":
if len(sys.argv) == 2:
if len(sys.argv) != 2:
print "Need one argument."
else:
importRepo(sys.argv[1], "dom/tests/mochitest/w3c")

View File

@ -1,4 +1,4 @@
# THIS FILE IS AUTOGENERATED - DO NOT EDIT
# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT
DEPTH = ../../../../../../../../..