summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2020-07-25 12:16:43 -0700
committerPatrick Ohly <patrick.ohly@intel.com>2020-08-09 16:26:42 +0200
commitfb8e527afc18526a7b6408cc11067d273040e901 (patch)
tree12486f5bfb7781c86e85e4998cabd610e19f9820
parent407f213a7ff268d57663c3754d7d258031f3d473 (diff)
runtests.py: do not use resources.py during Git checkout
The script comes from SyncEvolution and might not be ready yet when checking out other repos. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
-rwxr-xr-xtest/runtests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/runtests.py b/test/runtests.py
index 208bc058..9e81dd29 100755
--- a/test/runtests.py
+++ b/test/runtests.py
@@ -676,7 +676,7 @@ class GitCheckout(GitCheckoutBase, Action):
cmd = "cd %s && git fetch" % (self.basedir)
else:
cmd = "git clone %s %s && chmod -R g+w %s && cd %s && git config core.sharedRepository group " % (self.url, self.basedir, self.basedir, self.basedir)
- context.runCommand(cmd)
+ context.runCommand(cmd, jobs=None)
context.runCommand("cd %(dir)s && git show-ref &&"
"((git tag -l | grep -w -q %(rev)s) && git checkout %(rev)s ||"
"((git branch -l | grep -w -q %(rev)s) && git checkout %(rev)s || git checkout -b %(rev)s origin/%(rev)s) && git merge origin/%(rev)s)" %
@@ -687,7 +687,7 @@ class GitCheckout(GitCheckoutBase, Action):
runAsIs=True)
cd(self.basedir)
if os.access("autogen.sh", os.F_OK):
- context.runCommand("%s ./autogen.sh" % (self.runner))
+ context.runCommand("%s ./autogen.sh" % (self.runner), jobs=None)
class GitCopy(GitCheckoutBase, Action):
"""Copy existing git repository and update it to the requested