mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
selftesthelpers: Simplify detection of tap2subunit.
This commit is contained in:
parent
fd607e0a9e
commit
05dc5a39a6
@ -64,15 +64,17 @@ else:
|
||||
|
||||
python = os.getenv("PYTHON", "python")
|
||||
|
||||
#Set a default value, overridden if we find a working one on the system
|
||||
# Set a default value, overridden if we find a working one on the system
|
||||
tap2subunit = "PYTHONPATH=%s/lib/subunit/python:%s/lib/testtools %s %s/lib/subunit/filters/tap2subunit" % (srcdir(), srcdir(), python, srcdir())
|
||||
|
||||
sub = subprocess.Popen("tap2subunit 2> /dev/null", stdout=subprocess.PIPE, stdin=subprocess.PIPE, shell=True)
|
||||
sub = subprocess.Popen("tap2subunit", stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
sub.communicate("")
|
||||
|
||||
if sub.returncode == 0:
|
||||
cmd = "echo -ne \"1..1\nok 1 # skip doesn't seem to work yet\n\" | tap2subunit 2> /dev/null | grep skip"
|
||||
sub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
|
||||
cmd = "echo -ne \"1..1\nok 1 # skip doesn't seem to work yet\n\" | tap2subunit | grep skip"
|
||||
sub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE, shell=True)
|
||||
if sub.returncode == 0:
|
||||
tap2subunit = "tap2subunit"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user