Add support for external variables

Author: Lana243

server/src/Tests.cpp

@@ -1160,4 +1160,9 @@ bool isUnnamed(char *name) {
 bool Tests::MethodTestCase::isError() const {
     return suiteName == ERROR_SUITE_NAME;
 }
+
+bool Tests::TypeAndVarName::operator<(const Tests::TypeAndVarName &other) const {
+    return varName < other.varName || (varName == other.varName && type.mTypeName() < other.type.mTypeName());
+}
+
 }

server/src/Tests.h

@@ -336,6 +336,8 @@ namespace tests {
             TypeAndVarName(types::Type type, std::string varName)
                 : type(std::move(type)), varName(std::move(varName)) {
             }
+
+            bool operator<(const TypeAndVarName &) const;
         };
 
         struct MethodParam {
@@ -558,6 +560,7 @@ namespace tests {
         fs::path testHeaderFilePath;
         fs::path testSourceFilePath;
 
+        std::set<TypeAndVarName> externVariables;
         std::vector<Include> srcFileHeaders;
         std::vector<Include> headersBeforeMainHeader;
         std::optional<Include> mainHeader;

server/src/coverage/TestRunner.cpp

@@ -1,3 +1,4 @@
+#include <utils/stats/TestsExecutionStats.h>
 #include "TestRunner.h"
 
 #include "printers/DefaultMakefilePrinter.h"
@@ -152,6 +153,13 @@ grpc::Status TestRunner::runTests(bool withCoverage, const std::optional<std::ch
                                       exceptions.emplace_back(e);
                                   }
                               });
+    fs::remove(Paths::getGTestResultsJsonPath(projectContext));
+//    StatsUtils::TestsExecutionStatsFileMap testsExecutionStats(projectContext, coverageGenerator.getTestResultMap(),
+//                                                               coverageGenerator.getCoverageMap());
+//    printer::CSVPrinter printer = testsExecutionStats.toCSV();
+//    FileSystemUtils::writeToFile(Paths::getExecutionStatsCSVPath(projectContext), printer.getStream().str());
+//    LOG_S(INFO) << StringUtils::stringFormat("See execution stats here: %s",
+//                                             Paths::getExecutionStatsCSVPath(projectContext));
     LOG_S(DEBUG) << "All run commands were executed";
     return Status::OK;
 }

server/src/fetchers/GlobalVariableUsageMatchCallback.cpp

@@ -20,10 +20,6 @@ void GlobalVariableUsageMatchCallback::checkUsage(const MatchFinder::MatchResult
             Result.Nodes.getNodeAs<clang::VarDecl>(Matchers::GLOBAL_VARIABLE_USAGE)) {
         clang::QualType varType = pVarDecl->getType();
         std::string name = pVarDecl->getNameAsString();
-        if (!pVarDecl->isKnownToBeDefined()) {
-            LOG_S(DEBUG) << "Variable \"" << name << "\" was skipped - it has no definition.";
-            return;
-        }
         if (const auto *pFunctionDecl = Result.Nodes.getNodeAs<clang::FunctionDecl>(
                 Matchers::FUNCTION_USED_GLOBAL_VARIABLE)) {
             if (varType.isConstant(pVarDecl->getASTContext())) {
@@ -62,12 +58,15 @@ void GlobalVariableUsageMatchCallback::handleUsage(const clang::FunctionDecl *fu
         return;
     }
 
-    auto &methods = (*parent->projectTests).at(sourceFilePath).methods;
-    auto &method = methods[usage.functionName];
+    auto &tests = (*parent->projectTests).at(sourceFilePath);
+    auto &method = tests.methods[usage.functionName];
     const clang::QualType realParamType = varDecl->getType().getCanonicalType();
     const std::string usedParamTypeString = varDecl->getType().getAsString();
     types::Type paramType = types::Type(realParamType, usedParamTypeString, sourceManager);
     method.globalParams.emplace_back(paramType, usage.variableName, AlignmentFetcher::fetch(varDecl));
+    if (varDecl->hasExternalStorage()) {
+        tests.externVariables.insert({paramType, usage.variableName});
+    }
 }
 
 GlobalVariableUsageMatchCallback::Usage::Usage(std::string variableName, std::string functionName)

server/src/printers/KleePrinter.cpp

@@ -113,7 +113,7 @@ fs::path KleePrinter::writeTmpKleeFile(
     LOG_S(DEBUG) << "Writing tmpKleeFile for " << testedMethod << " inside " << tests.sourceFilePath;
 
     bool hasMethod = false;
-    for (const auto &[methodName,testMethod ]: tests.methods) {
+    for (const auto &[methodName, testMethod]: tests.methods) {
         if (methodFilter(testMethod)) {
             hasMethod = true;
         }
@@ -143,6 +143,15 @@ fs::path KleePrinter::writeTmpKleeFile(
 
     writeAccessPrivateMacros(typesHandler, tests, false);
 
+    CollectionUtils::apply(tests.externVariables, [this](const Tests::TypeAndVarName &var) {
+        if (var.type.isArray()) {
+            strDeclareArrayVar(var.type, var.varName, types::PointerUsage::KNOWN_SIZE);
+        } else {
+            strDeclareVar(var.type.mTypeName(), var.varName);
+        }
+    });
+    ss << NL;
+
     for (const auto &[methodName, testMethod] : tests.methods) {
         if (!methodFilter(testMethod)) {
             continue;

server/src/printers/TestsPrinter.cpp

@@ -61,6 +61,16 @@ void TestsPrinter::joinToFinalCode(Tests &tests, const fs::path& generatedHeader
     resetStream();
     writeCopyrightHeader();
     genHeaders(tests, generatedHeaderPath);
+    ss << NL;
+
+    CollectionUtils::apply(tests.externVariables, [this](const Tests::TypeAndVarName &var) {
+        if (var.type.isArray()) {
+            strDeclareArrayVar(var.type, var.varName, types::PointerUsage::KNOWN_SIZE);
+        } else {
+            strDeclareVar(var.type.mTypeName(), var.varName);
+        }
+    });
+
     ss << "namespace " << PrinterUtils::TEST_NAMESPACE << " {\n";
 
     for (const auto &commentBlock : tests.commentBlocks) {

server/src/utils/CollectionUtils.h

@@ -135,6 +135,13 @@ namespace CollectionUtils {
         return result;
     }
 
+    template <typename Iterable, typename Functor>
+    void apply(Iterable const &items, Functor &&functor) {
+        for (auto it : items) {
+            functor(it);
+        }
+    }
+
     /**
      * @brief Transforms given collection to another by applying functor to each element.
      * @param items collection of type Collection with elements of type T.

server/test/framework/Regression_Tests.cpp

@@ -359,4 +359,12 @@ namespace {
         ASSERT_TRUE(status.ok()) << status.error_message();
         testUtils::checkMinNumberOfTests(testGen.tests, 1);
     }
+
+    TEST_F(Regression_Test, Extern_Variables) {
+        fs::path source = getTestFilePath("issue-514.c");
+        auto [testGen, status] = createTestForFunction(source, 5);
+
+        ASSERT_TRUE(status.ok()) << status.error_message();
+    }
+
 }

server/test/suites/regression/CMakeLists.txt

@@ -48,5 +48,6 @@ target_compile_definitions(issue-276 PUBLIC EXPORT3=4)
 target_compile_definitions(issue-276 PUBLIC EXPORT4="4")
 
 add_library(issue-195 issue-195.c)
+add_library(issue-514 issue-514.c)
 
 set_target_properties(regression PROPERTIES LINK_WHAT_YOU_USE TRUE)

server/test/suites/regression/issue-514.c

@@ -0,0 +1,7 @@
+#define MAX_INDEX 10
+
+extern unsigned g_arrayNumber[MAX_INDEX];
+
+unsigned GetNum(unsigned index) {
+    return g_arrayNumber[index];
+}