Merge branch 'master' into gmp

vprover · Jan 8, 2025 · a8c805c · a8c805c
2 parents edd4bf1 + 1f3a308
commit a8c805c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -3,6 +3,8 @@ on:
   workflow_dispatch:
   pull_request:
     types: [opened, reopened, synchronize]
+  push:
+    branches: [master]
 
 jobs:
   build:

diff --git a/Shell/Statistics.cpp b/Shell/Statistics.cpp
@@ -233,6 +233,9 @@ void Statistics::print(std::ostream& out)
   case Statistics::TIME_LIMIT:
     out << "Time limit";
     break;
+  case Statistics::INSTRUCTION_LIMIT:
+    out << "Instruction limit";
+    break;
   case Statistics::MEMORY_LIMIT:
     out << "Memory limit";
     break;

diff --git a/Shell/UIHelper.cpp b/Shell/UIHelper.cpp
@@ -528,6 +528,14 @@ void UIHelper::outputResult(std::ostream& out)
     addCommentSignForSZS(out);
     out << "Time limit reached!\n";
     break;
+  case Statistics::INSTRUCTION_LIMIT:
+    if(env.options->outputMode() == Options::Output::SMTCOMP){
+      out << "unknown" << endl;
+      return;
+    }
+    addCommentSignForSZS(out);
+    out << "Instruction limit reached!\n";
+    break;
   case Statistics::MEMORY_LIMIT:
     if(env.options->outputMode() == Options::Output::SMTCOMP){
       out << "unknown" << endl;