Added math header for lazy instntiated objects if required. Increased…

… bcov timelimit.
UnitTestBot · Sep 5, 2022 · 502adfa · 502adfa
1 parent 69f5f2d
commit 502adfa
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/server/src/KleeRunner.cpp b/server/src/KleeRunner.cpp
@@ -222,12 +222,13 @@ KleeRunner::createKleeParams(const tests::TestMethod &testMethod,
                                           "--libc=klee",
                                           "--utbot",
                                           "--posix-runtime",
+                                          "--type-system=CXX",
                                           "--fp-runtime",
                                           "--only-output-states-covering-new",
                                           "--allocate-determ",
                                           "--external-calls=all",
                                           "--timer-interval=1000ms",
-                                          "--bcov-check-interval=6s",
+                                          "--bcov-check-interval=10s",
                                           "-istats-write-interval=5s",
                                           "--disable-verify",
                                           "--check-div-zero=false",

diff --git a/server/src/printers/TestsPrinter.cpp b/server/src/printers/TestsPrinter.cpp
@@ -18,22 +18,34 @@ using printer::TestsPrinter;
 TestsPrinter::TestsPrinter(const types::TypesHandler *typesHandler, utbot::Language srcLanguage) : Printer(srcLanguage) , typesHandler(typesHandler) {
 }
 
+bool TestsPrinter::paramNeedsMathHeader(const Tests::TestCaseParamValue &paramValue) {
+    if (paramValue.view->containsFPSpecialValue()) {
+        return true;
+    }
+    for (const auto &lazyParamValue : paramValue.lazyValues) {
+        if (paramNeedsMathHeader(lazyParamValue)) {
+            return true;
+        }
+    }
+    return false;
+}
+
 //we need this header for tests with generated NAN and INFINITY parameters to be compilable
 bool TestsPrinter::needsMathHeader(const Tests &tests) {
     for (const auto &[methodName, methodDescription] : tests.methods) {
         for (const auto &methodTestCase : methodDescription.testCases) {
             for (const auto &paramValue : methodTestCase.paramValues) {
-                if (paramValue.view->containsFPSpecialValue()) {
+                if (paramNeedsMathHeader(paramValue)) {
                     return true;
                 }
             }
             for (const auto &paramValue : methodTestCase.globalPreValues) {
-                    if (paramValue.view->containsFPSpecialValue()) {
+                if (paramNeedsMathHeader(paramValue)) {
                     return true;
                 }
             }
             for (const auto &paramValue : methodTestCase.globalPostValues) {
-                    if (paramValue.view->containsFPSpecialValue()) {
+                if (paramNeedsMathHeader(paramValue)) {
                     return true;
                 }
             }

diff --git a/server/src/printers/TestsPrinter.h b/server/src/printers/TestsPrinter.h
@@ -115,6 +115,8 @@ namespace printer {
     private:
         types::TypesHandler const *typesHandler;
 
+        static bool paramNeedsMathHeader(const Tests::TestCaseParamValue &paramValue);
+
         void
         parametrizedInitializeGlobalVariables(const Tests::MethodDescription &methodDescription,
                                               const Tests::MethodTestCase &testCase);