From 19b2166688678a16808072c5c9302421834003e8 Mon Sep 17 00:00:00 2001 From: Hernan Ponce de Leon Date: Thu, 17 Oct 2024 19:19:18 +0800 Subject: [PATCH 1/2] Move svcomp options to *.properties file Signed-off-by: Hernan Ponce de Leon --- Dartagnan-SVCOMP.sh | 2 +- svcomp.properties | 4 ++++ svcomp/src/main/java/com/dat3m/svcomp/SVCOMPRunner.java | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 svcomp.properties diff --git a/Dartagnan-SVCOMP.sh b/Dartagnan-SVCOMP.sh index bccc0c8497..469a2e5004 100755 --- a/Dartagnan-SVCOMP.sh +++ b/Dartagnan-SVCOMP.sh @@ -33,6 +33,6 @@ else skip_assertions_of_type="" fi - cmd="java -jar svcomp/target/svcomp.jar --method=eager --encoding.integers=true $skip_assertions_of_type --svcomp.step=5 --svcomp.umax=27 cat/svcomp.cat --svcomp.property="$propertypath" "$programpath" "$witness + cmd="java -jar svcomp/target/svcomp.jar $skip_assertions_of_type cat/svcomp.cat --svcomp.property="$propertypath" "$programpath" "$witness fi $cmd diff --git a/svcomp.properties b/svcomp.properties new file mode 100644 index 0000000000..f593a31ff3 --- /dev/null +++ b/svcomp.properties @@ -0,0 +1,4 @@ +method=eager +encoding.integers=true +svcomp.step=5 +svcomp.umax=27 diff --git a/svcomp/src/main/java/com/dat3m/svcomp/SVCOMPRunner.java b/svcomp/src/main/java/com/dat3m/svcomp/SVCOMPRunner.java index bd9df60438..6f5a6e80c7 100644 --- a/svcomp/src/main/java/com/dat3m/svcomp/SVCOMPRunner.java +++ b/svcomp/src/main/java/com/dat3m/svcomp/SVCOMPRunner.java @@ -124,6 +124,7 @@ public static void main(String[] args) throws Exception { cmd.addAll(Arrays.asList("-jar", System.getenv().get("DAT3M_HOME") + "/dartagnan/target/dartagnan.jar")); cmd.add(fileModel.toString()); cmd.add(programPath); + cmd.add("svcomp.properties"); cmd.add(String.format("--%s=%s", PROPERTY, r.property.asStringOption())); cmd.add(String.format("--%s=%s", BOUND, bound)); cmd.add(String.format("--%s=%s", WITNESS, GRAPHML.asStringOption())); From 9662f8c1471e3956df31b0635d276cfe6bd7419e Mon Sep 17 00:00:00 2001 From: Hernan Ponce de Leon Date: Thu, 17 Oct 2024 19:20:20 +0800 Subject: [PATCH 2/2] Format Signed-off-by: Hernan Ponce de Leon --- svcomp.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svcomp.properties b/svcomp.properties index f593a31ff3..d11788f771 100644 --- a/svcomp.properties +++ b/svcomp.properties @@ -1,4 +1,4 @@ method=eager encoding.integers=true svcomp.step=5 -svcomp.umax=27 +svcomp.umax=27