DeforaNetworks/deepstate
3
0
Fork 0
Code Releases Activity

More criterion control

Browse Source
This commit is contained in:
agroce 2019-06-16 11:28:31 -07:00
parent 6a4dcb1d5c
commit a48270bc79
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bin/deepstate/reducer.py
View File

@ -36,14 +36,15 @@ def main():
parser.add_argument( parser.add_argument(
"--which_test", type=str, help="Which test to run (equivalent to --input_which_test).", default=None) "--which_test", type=str, help="Which test to run (equivalent to --input_which_test).", default=None)
parser.add_argument( parser.add_argument(
"--criterion", type=str, help="String to search for in valid reduction outputs (criteria are ORed).", "--criterion", type=str, help="String to search for in valid reduction outputs (criteria are ORed by default).",
default=None) default=None)
parser.add_argument( parser.add_argument(
"--regexpCriterion", type=str, help="Regexp to search for in valid reduction outputs (criteria are ORed).", "--regexpCriterion", type=str, help="Regexp to search for in valid reduction outputs (criteria are ORed by default).",
default=None) default=None)
parser.add_argument( parser.add_argument(
"--exitCriterion", type=int, help="Exit criteria for valid reductions (criteria are ORed).", "--exitCriterion", type=int, help="Exit code for valid reductions (criteria are ORed by default).",
default=None) default=None)
parser.add_argument("--andCriteria", action="store_true", help="AND criteria instead of ORing them")
parser.add_argument( parser.add_argument(
"--cmdArgs", type=str, help="Command line to use in place of standard DeepState arguments, file replaces @@") "--cmdArgs", type=str, help="Command line to use in place of standard DeepState arguments, file replaces @@")
parser.add_argument( parser.add_argument(
@ -125,15 +126,8 @@ def main():
result.append(line) result.append(line)
return (result, exitCode) return (result, exitCode)
def checks((result, exitCode)): def checks(resultAndExitCode):
if args.exitCriterion is not None: (result, exitCode) = resultAndExitCode
if exitCode == args.exitCriterion:
return True
if checkRegExp is not None:
if re.search(checkRegExp, "\n".join(result)) is not None:
return True
if checkString is not None:
return checkString in "\n".join(result)
if (args.exitCriterion is None) and (checkRegExp is None) and (checkString is None): if (args.exitCriterion is None) and (checkRegExp is None) and (checkString is None):
# Only apply default DeepState failure check if no other criteria were defined # Only apply default DeepState failure check if no other criteria were defined
for line in result: for line in result:
@ -141,7 +135,23 @@ def main():
return True return True
if "ERROR: Crashed" in line: if "ERROR: Crashed" in line:
return True return True
return False
if args.exitCriterion is not None:
exitHolds = exitCode == args.exitCriterion
else:
exitHolds = args.andCriteria
if checkRegExp is not None:
regexpHolds = re.search(checkRegExp, "\n".join(result)) is not None
else:
regexpHolds = args.andCriteria
if checkString is not None:
stringHolds = checkString in "\n".join(result)
else:
stringHolds = args.andCriteria
if args.andCriteria:
return exitHolds and regexpHolds and stringHolds
else:
return exitHolds or regexpHolds or stringHolds
def writeAndRunCandidate(test): def writeAndRunCandidate(test):
with open(candidateName, 'wb') as outf: with open(candidateName, 'wb') as outf: