Merge #7402: [devtools] github-merge get toplevel dir without extra whitespace

5ed2f16 [devtools] github-merge get toplevel dir without extra whitespace (Andrew C)
This commit is contained in:
Wladimir J. van der Laan 2016-01-25 15:42:11 +01:00
commit 6a5932bf2a
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -165,7 +165,7 @@ def main():
# Run test command if configured. # Run test command if configured.
if testcmd: if testcmd:
# Go up to the repository's root. # Go up to the repository's root.
toplevel = subprocess.check_output([GIT,'rev-parse','--show-toplevel']) toplevel = subprocess.check_output([GIT,'rev-parse','--show-toplevel']).strip()
os.chdir(toplevel) os.chdir(toplevel)
if subprocess.call(testcmd,shell=True): if subprocess.call(testcmd,shell=True):
print("ERROR: Running %s failed." % testcmd,file=stderr) print("ERROR: Running %s failed." % testcmd,file=stderr)