summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Oliver Stöneberg <firewave@users.noreply.github.com>2014-03-03 22:32:21 +0000
committer Oliver Stöneberg <firewave@users.noreply.github.com>2014-03-03 22:32:21 +0000
commit0f3932081467309094bb7e5b53caccf68d98e983 (patch)
treeab380d28106d015251a5617c1c681413ff79abda /src
parent1df0e37933389015408a65a29ab3f63526de2f21 (diff)
chdtest.py might have reported, that all tests were successful even if one failed / cleanups (nw)
Diffstat (limited to 'src')
-rw-r--r--src/regtests/chdman/chdtest.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/regtests/chdman/chdtest.py b/src/regtests/chdman/chdtest.py
index 048fa005c4e..5191a338c08 100644
--- a/src/regtests/chdman/chdtest.py
+++ b/src/regtests/chdman/chdtest.py
@@ -37,6 +37,7 @@ def sha1sum(path):
return sha1.hexdigest()
def extractcdAndCompare(type):
+ global failure
extractFileDir = os.path.join(tempFilePath, type + "_output")
if not os.path.exists(extractFileDir):
os.makedirs(extractFileDir)
@@ -49,8 +50,8 @@ def extractcdAndCompare(type):
print d + " - extractcd (" + type + ") failed with " + str(exitcode) + " (" + stderr + ")"
failure = True
- sha1_extract = sha1sum(extractFile);
- sha1_extract_bin = sha1sum(extractFileBin);
+ sha1_extract = sha1sum(extractFile)
+ sha1_extract_bin = sha1sum(extractFileBin)
extractFileDir = os.path.join(tempFilePath, type + "_temp")
if not os.path.exists(extractFileDir):
@@ -64,8 +65,8 @@ def extractcdAndCompare(type):
print d + " - extractcd (" + type + ") failed with " + str(exitcode) + " (" + stderr + ")"
failure = True
- sha1_extract_2 = sha1sum(extractFile);
- sha1_extract_bin_2 = sha1sum(extractFileBin);
+ sha1_extract_2 = sha1sum(extractFile)
+ sha1_extract_bin_2 = sha1sum(extractFileBin)
if not sha1_extract == sha1_extract_2:
print "expected: " + sha1_extract + " found: " + sha1_extract_2
@@ -78,6 +79,7 @@ def extractcdAndCompare(type):
failure = True
def extractAndCompare(command, ext):
+ global failure
extractFileDir = os.path.join(tempFilePath, ext + "_output")
if not os.path.exists(extractFileDir):
os.makedirs(extractFileDir)
@@ -89,7 +91,7 @@ def extractAndCompare(command, ext):
print d + " - " + command + " (" + ext + ") failed with " + str(exitcode) + " (" + stderr + ")"
failure = True
- sha1_extract = sha1sum(extractFile);
+ sha1_extract = sha1sum(extractFile)
extractFileDir = os.path.join(tempFilePath, ext + "_temp")
if not os.path.exists(extractFileDir):
@@ -102,7 +104,7 @@ def extractAndCompare(command, ext):
print d + " - " + command + " (" + ext + ") failed with " + str(exitcode) + " (" + stderr + ")"
failure = True
- sha1_extract_2 = sha1sum(extractFile);
+ sha1_extract_2 = sha1sum(extractFile)
if not sha1_extract == sha1_extract_2:
print "expected: " + sha1_extract + " found: " + sha1_extract_2
@@ -140,8 +142,6 @@ for root, dirs, files in os.walk(inputPath):
if d.startswith("."):
continue
- failure = False
-
command = ext = d.split("_", 2)[0]
inFile = os.path.join(root, d, "in")
# TODO: make this better