From 1a99e00d927b9981f46da2bfe64c37627027d5d5 Mon Sep 17 00:00:00 2001
From: jawher-j <92947144+jawher-j@users.noreply.github.com>
Date: Mon, 8 Jul 2024 15:00:36 +0200
Subject: [PATCH] Update timeout for running proverif in tests
---
.../SecurityGenerationForTMAP.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/tmltranslator/patternhandling/SecurityGenerationForTMAP.java b/src/main/java/tmltranslator/patternhandling/SecurityGenerationForTMAP.java
index f7a924dbc5..2c39262489 100644
--- a/src/main/java/tmltranslator/patternhandling/SecurityGenerationForTMAP.java
+++ b/src/main/java/tmltranslator/patternhandling/SecurityGenerationForTMAP.java
@@ -145,14 +145,6 @@ public class SecurityGenerationForTMAP implements Runnable {
final Reader[] data = new Reader[1];
final ExecutorService executor = Executors.newSingleThreadExecutor();
if (timeOutInSeconds > 0) {
- try {
- process[0] = Runtime.getRuntime().exec(cmd);
- data[0] = new BufferedReader(new InputStreamReader(process[0].getInputStream()));
- } catch (Exception e) {
- TraceManager.addDev("FAILED: executing: " + cmd + ": " + e.getMessage());
- throw new RuntimeException(e);
- }
- } else {
final Future<?> future = executor.submit(() -> {
try {
process[0] = Runtime.getRuntime().exec(cmd);
@@ -170,6 +162,14 @@ public class SecurityGenerationForTMAP implements Runnable {
} finally {
executor.shutdown();
}
+ } else {
+ try {
+ process[0] = Runtime.getRuntime().exec(cmd);
+ data[0] = new BufferedReader(new InputStreamReader(process[0].getInputStream()));
+ } catch (Exception e) {
+ TraceManager.addDev("FAILED: executing: " + cmd + ": " + e.getMessage());
+ throw new RuntimeException(e);
+ }
}
ProVerifOutputAnalyzer pvoa = avatar2proverif.getOutputAnalyzer();
pvoa.analyzeOutput(data[0], true);
--
GitLab