diff --git a/dom/imptests/importTestsuite.py b/dom/imptests/importTestsuite.py index 31193a6c5a3..a5da76acd12 100644 --- a/dom/imptests/importTestsuite.py +++ b/dom/imptests/importTestsuite.py @@ -20,8 +20,6 @@ import sys import parseManifest import writeBuildFiles -HEADERS_SUFFIX = "^headers^" - def parseManifestFile(dest, dir): subdirs, mochitests, _, __, supportfiles = parseManifest.parseManifestFile("hg-%s/%s/MANIFEST" % (dest, dir)) return subdirs, mochitests, supportfiles @@ -54,13 +52,6 @@ def makePath(a, b): return a return "%s/%s" % (a, b) -def copyTest(source, dest): - """Copy the file at source to dest, as well as any ^headers^ file associated - with it.""" - shutil.copy(source, dest) - if os.path.exists(source + HEADERS_SUFFIX): - shutil.copy(source + HEADERS_SUFFIX, dest + HEADERS_SUFFIX) - def copy(dest, directories): """Copy mochitests and support files from the external HG directory to their place in mozilla-central. @@ -73,9 +64,9 @@ def copy(dest, directories): os.makedirs(destdir) for mochitest in mochitests: - copyTest("%s/%s" % (sourcedir, mochitest), "%s/test_%s" % (destdir, mochitest)) + shutil.copy("%s/%s" % (sourcedir, mochitest), "%s/test_%s" % (destdir, mochitest)) for support in supportfiles: - copyTest("%s/%s" % (sourcedir, support), "%s/%s" % (destdir, support)) + shutil.copy("%s/%s" % (sourcedir, support), "%s/%s" % (destdir, support)) if len(subdirs): if d: @@ -110,7 +101,6 @@ def printBuildFiles(dest, directories): files = ["test_%s" % (mochitest, ) for mochitest in mochitests] files.extend(supportfiles) - files.extend(f for f in os.listdir(path) if f.endswith(HEADERS_SUFFIX)) with open(path + "/Makefile.in", "w") as fh: result = writeBuildFiles.substMakefile("importTestsuite.py", files)