Bug 866424 - Part e: Remove the unused thissrcdir argument to several functions; r=jhammel
authorMs2ger <ms2ger@gmail.com>
Fri, 10 May 2013 09:11:55 +0200
changeset 142314 6409db53f33b4c7547f78a0dc41f376cdf874f6e
parent 142313 8e0e481f674639c07e44c5cf640f2ca0538bf5a7
child 142315 616de9bdf29c85dc4f4b959de0778d570be55a30
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjhammel
bugs866424
milestone23.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 866424 - Part e: Remove the unused thissrcdir argument to several functions; r=jhammel
dom/imptests/importTestsuite.py
--- a/dom/imptests/importTestsuite.py
+++ b/dom/imptests/importTestsuite.py
@@ -56,17 +56,17 @@ def makePath(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(thissrcdir, dest, directories):
+def copy(dest, directories):
     """Copy mochitests and support files from the external HG directory to their
     place in mozilla-central.
     """
     print("Copying %s..." % directories)
     for d in directories:
         subdirs, mochitests, supportfiles = parseManifestFile(dest, d)
         sourcedir = makePath("hg-%s" % dest, d)
         destdir = makePath(dest, d)
@@ -74,36 +74,36 @@ def copy(thissrcdir, dest, directories):
 
         for mochitest in mochitests:
             copyTest("%s/%s" % (sourcedir, mochitest), "%s/test_%s" % (destdir, mochitest))
         for support in supportfiles:
             copyTest("%s/%s" % (sourcedir, support), "%s/%s" % (destdir, support))
 
         if len(subdirs):
             if d:
-                importDirs(thissrcdir, dest, ["%s/%s" % (d, subdir) for subdir in subdirs])
+                importDirs(dest, ["%s/%s" % (d, subdir) for subdir in subdirs])
             else:
                 # Empty directory, i.e., the repository root
-                importDirs(thissrcdir, dest, subdirs)
+                importDirs(dest, subdirs)
 
 def printMozbuildFile(dest, directories):
     """Create a .mozbuild file to be included into the main moz.build, which
     lists the directories with tests.
     """
     print("Creating mozbuild...")
     path = dest + ".mozbuild"
     with open(path, 'w') as fh:
         normalized = [makePath(dest, d) for d in directories]
         result = writeBuildFiles.substMozbuild("importTestsuite.py",
             normalized)
         fh.write(result)
 
     subprocess.check_call(["hg", "add", path])
 
-def printBuildFiles(thissrcdir, dest, directories):
+def printBuildFiles(dest, directories):
     """Create Makefile.in files for each directory that contains tests we import.
     """
     print("Creating build files...")
     for d in directories:
         path = makePath(dest, d)
         print("Creating Makefile.in in %s..." % path)
 
         subdirs, mochitests, supportfiles = parseManifestFile(dest, d)
@@ -124,50 +124,50 @@ def printBuildFiles(thissrcdir, dest, di
 
 
 def hgadd(dest, directories):
     """Inform hg of the files in |directories|."""
     print("hg addremoving...")
     for d in directories:
         subprocess.check_call(["hg", "addremove", "%s/%s" % (dest, d)])
 
-def importDirs(thissrcdir, dest, directories):
-    copy(thissrcdir, dest, directories)
-    printBuildFiles(thissrcdir, dest, directories)
+def importDirs(dest, directories):
+    copy(dest, directories)
+    printBuildFiles(dest, directories)
 
 def removeAndCloneRepo(vcs, url, dest):
     """Replaces the repo at dest by a fresh clone from url using vcs"""
     assert vcs in ('hg', 'git')
 
     print("Removing %s..." % dest)
     subprocess.check_call(["rm", "-rf", dest])
 
     print("Cloning %s to %s with %s..." % (url, dest, vcs))
     subprocess.check_call([vcs, "clone", url, dest])
 
-def importRepo(confFile, thissrcdir):
+def importRepo(confFile):
     try:
         vcs, url, iden, directories = getData(confFile)
         dest = iden
         hgdest = "hg-%s" % iden
 
         print("Removing %s..." % dest)
         subprocess.check_call(["rm", "-rf", dest])
 
         removeAndCloneRepo(vcs, url, hgdest)
 
         print("Going to import %s..." % directories)
-        importDirs(thissrcdir, dest, directories)
+        importDirs(dest, directories)
         printMozbuildFile(dest, directories)
         hgadd(dest, directories)
         print("Removing %s again..." % hgdest)
         subprocess.check_call(["rm", "-rf", hgdest])
     except subprocess.CalledProcessError as e:
         print(e.returncode)
     finally:
         print("Done")
 
 if __name__ == "__main__":
     if len(sys.argv) != 2:
         print("Need one argument.")
     else:
-        importRepo(sys.argv[1], "dom/imptests")
+        importRepo(sys.argv[1])