Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge functionality to filter out tests #9

Open
wants to merge 14 commits into
base: Latest
Choose a base branch
from
Open

Merge functionality to filter out tests #9

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9d6fa58
Merge branch 'master' into synthesizeTests
Dargones Jun 23, 2022
cc6a05d
verify test method before printing
tbean79 Jun 28, 2022
d8d1ec7
docs: Remove mention of rise4fun editor (#2344)
cpitclaudel Jul 1, 2022
a7a2244
verify test method before printing
tbean79 Jun 28, 2022
62f3479
fix relative path bug
tbean79 Jul 1, 2022
2dccc82
merge for pull
tbean79 Jul 1, 2022
38eaadf
merge with sythesizeTests
tbean79 Jul 1, 2022
965a0ed
copy paste merge timeout
tbean79 Jul 1, 2022
9dab9d7
Fixes gutter when cache is enabled (#2312)
MikaelMayer Jul 1, 2022
52405d1
nightly build failed (#2161)
MikaelMayer Jul 1, 2022
5487792
Fix: No more crashing on hovering bodies of nested match statements …
MikaelMayer Jul 1, 2022
5ba8c64
Merge branch 'master' into synthesizeTests
MikaelMayer Jul 1, 2022
e1cca66
silence error reports during pruning
tbean79 Jul 2, 2022
c51bca5
merge with synthesizeTests 5ba8c64
tbean79 Jul 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
silence error reports during pruning
  • Loading branch information
@tbean79
tbean79 committed Jul 2, 2022
commit e1cca6635b9c2625d4f8c6ca1fd560d1839ae764
55 changes: 30 additions & 25 deletions Source/DafnyTestGeneration/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,33 +118,38 @@ public static class Main {
}

private static async Task<string> RetMethodIfVerified(string sourceFile, DafnyInfo dafnyInfo, string methodStr) {
string testClassPrelude = GetTestClassPrelude(sourceFile, dafnyInfo).Aggregate("", (x, y) => x = x + y + '\n');
string testClassWithSingleMethod = testClassPrelude + methodStr
+ TestMethod.EmitSynthesizeMethods() + "\n}";
Program? dafnyProgram = Utils.Parse(testClassWithSingleMethod, Path.GetFileName(sourceFile));

if (dafnyProgram != null) {
var engine = Microsoft.Boogie.ExecutionEngine.CreateWithoutSharedCache(DafnyOptions.O);
var boogiePrograms = Translator.Translate(dafnyProgram, dafnyProgram.Reporter).ToList().ConvertAll(tuple => tuple.Item2);
var boogieProgram = ProgramModifier.MergeBoogiePrograms(boogiePrograms);
var writer = new StringWriter();
var uniqueId = System.Guid.NewGuid().ToString();

Task<(Microsoft.Boogie.PipelineOutcome, Microsoft.Boogie.PipelineStatistics)>
boogieTask = Microsoft.Dafny.Main.BoogieOnce(writer, engine, "", "", boogieProgram, uniqueId);

var task = await Task.WhenAny(
boogieTask,
Task.Delay(System.TimeSpan.FromSeconds(DafnyOptions.O.TestGenOptions.Timeout)));

if (task == boogieTask) {
var (outcome, stats) = await boogieTask;

if (Microsoft.Dafny.Main.IsBoogieVerified(outcome, stats))
return methodStr;
try {
string testClassPrelude = GetTestClassPrelude(sourceFile, dafnyInfo).Aggregate("", (x, y) => x = x + y + '\n');
string testClassWithSingleMethod = testClassPrelude + methodStr
+ TestMethod.EmitSynthesizeMethods() + "\n}";
Program? dafnyProgram = Utils.Parse(testClassWithSingleMethod,
Path.GetFileName(sourceFile), new ErrorReporterSink());

if (dafnyProgram != null) {
var engine = Microsoft.Boogie.ExecutionEngine.CreateWithoutSharedCache(DafnyOptions.O);
var boogiePrograms = Translator.Translate(dafnyProgram, dafnyProgram.Reporter).ToList().ConvertAll(tuple => tuple.Item2);
var boogieProgram = ProgramModifier.MergeBoogiePrograms(boogiePrograms);
var writer = new StringWriter();
var uniqueId = System.Guid.NewGuid().ToString();

Task<(Microsoft.Boogie.PipelineOutcome, Microsoft.Boogie.PipelineStatistics)>
boogieTask = Microsoft.Dafny.Main.BoogieOnce(writer, engine, "", "", boogieProgram, uniqueId);

var task = await Task.WhenAny(
boogieTask,
Task.Delay(System.TimeSpan.FromSeconds(DafnyOptions.O.TestGenOptions.Timeout)));

if (task == boogieTask) {
var (outcome, stats) = await boogieTask;

if (Microsoft.Dafny.Main.IsBoogieVerified(outcome, stats))
return methodStr;
}
}
return "";
} catch (System.Exception) {
return "";
}
return "";
}

/// <summary>
Expand Down
5 changes: 3 additions & 2 deletions Source/DafnyTestGeneration/Utils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ public static class Utils {
/// <summary>
/// Parse a string read (from a certain file) to a Dafny Program
/// </summary>
public static Program? Parse(string source, string fileName = "") {
public static Program? Parse(string source, string fileName = "",
ErrorReporter? customReporter = null) {
ModuleDecl module = new LiteralModuleDecl(new DefaultModuleDecl(), null);
var builtIns = new BuiltIns();
var reporter = new ConsoleErrorReporter();
var reporter = customReporter ?? new ConsoleErrorReporter();
var success = Parser.Parse(source, fileName, fileName, null, module, builtIns,
new Errors(reporter)) == 0 && Microsoft.Dafny.Main.ParseIncludesDepthFirstNotCompiledFirst(module, builtIns,
new HashSet<string>(), new Errors(reporter)) == null;
Expand Down