Fix tests

UnitTestBot · Nov 15, 2023 · cc53c03 · cc53c03
1 parent 4881f03
commit cc53c03
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 16 deletions.
diff --git a/server/test/framework/Server_Tests.cpp b/server/test/framework/Server_Tests.cpp
@@ -1567,7 +1567,7 @@ namespace {
     TEST_F(Server_Test, precompiled_obj) {
         std::string suite = "precompiled";
         setSuite(suite);
-        static const std::string source2_c = getTestFilePath("source2.c");
+        static const std::string source2_c = getTestFilePath("source.c");
         auto projectRequest = createProjectRequest(projectName, suitePath, buildDirRelativePath, srcPaths,
                                                    GrpcUtils::UTBOT_AUTO_TARGET_PATH, false, false, 30,
                                                    ErrorMode::FAILING, false, true);

diff --git a/server/test/framework/main.cpp b/server/test/framework/main.cpp
@@ -71,10 +71,10 @@ int main(int argc, char **argv) {
         testUtils::tryExecGetBuildCommands(testUtils::getRelativeTestSuitePath("object-file"), clang,
                                            testUtils::MAKE_BUILD_COMMANDS_TOOL);
 
-        testUtils::tryExecGetBuildCommands(testUtils::getRelativeTestSuitePath("precompiled"), clang,
+        testUtils::tryExecGetBuildCommands(testUtils::getRelativeTestSuitePath("linkage-ld"), clang,
                                            testUtils::MAKE_BUILD_COMMANDS_TOOL);
 
-        testUtils::tryExecGetBuildCommands(testUtils::getRelativeTestSuitePath("linkage-ld"), clang,
+        testUtils::tryExecGetBuildCommands(testUtils::getRelativeTestSuitePath("precompiled"), clang,
                                            testUtils::MAKE_BUILD_COMMANDS_TOOL);
 
         testUtils::tryExecGetBuildCommands(testUtils::getRelativeTestSuitePath("small-project"), gcc);

diff --git a/server/test/suites/object-file/Makefile b/server/test/suites/object-file/Makefile
@@ -3,7 +3,7 @@
 all: exe
 
 clean:
-	rm exe lib.a lib1.o lib2.o source1.o
+	rm exe lib.a lib1.o lib2.o
 
 lib1.o: lib1.c
 	clang -c -o lib1.o lib1.c
@@ -14,8 +14,5 @@ lib2.o: lib2.c
 lib.a: lib1.o lib2.o
 	ar crs -o lib.a lib1.o lib2.o
 
-source1.o: source1.c
-	clang -c -o source1.o source1.c
-
-exe: source1.o source2.c lib.a
-	clang -o exe source1.o source2.c lib.a
+exe: source1.c source2.c lib.a
+	clang -o exe source1.c source2.c lib.a
diff --git a/server/test/suites/precompiled/Makefile b/server/test/suites/precompiled/Makefile
@@ -3,10 +3,10 @@
 all: exe
 
 clean:
-	rm source2.o exe
+	rm source.o exe
 
-source2.o: source2.c
-	clang -c -o source2.o source2.c
+source.o: source.c
+	clang -c -o source.o source.c
 
-exe: source2.o
-	clang -o exe ../object-file/source1.o source2.o
+exe: source.o
+	clang -o exe ../linkage-ld/issue-638.o source.o
diff --git a/server/test/suites/precompiled/source2.c → server/test/suites/precompiled/source.c b/server/test/suites/precompiled/source2.c → server/test/suites/precompiled/source.c
@@ -5,7 +5,7 @@ int g() {
 }
 
 int main(int argc, char *argv[]) {
-    if (f(argc) < 5) {
+    if (abs(argc) < 5) {
         return 0;
     } else {
         return atoi(argv[0]);

diff --git a/vscode-plugin/src/config/prefs.ts b/vscode-plugin/src/config/prefs.ts
@@ -89,7 +89,7 @@ export class Prefs {
         .setUsestubs(Prefs.useStubs())
         .setErrormode(Prefs.errorMode())
         .setDifferentvariablesofthesametype(Prefs.differentVariablesOfTheSameType())
-        .setSkipObjectWithoutSource(Prefs.SkipObjectWithoutSource);
+        .setSkipobjectwithoutsource(Prefs.skipObjectWithoutSource());
         return settingsContext;
     }