Skip to content

Commit 2c3779d

Browse files
committed
Fix tests
1 parent 4881f03 commit 2c3779d

File tree

6 files changed

+13
-16
lines changed

6 files changed

+13
-16
lines changed

Diff for: server/test/framework/Server_Tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1567,7 +1567,7 @@ namespace {
15671567
TEST_F(Server_Test, precompiled_obj) {
15681568
std::string suite = "precompiled";
15691569
setSuite(suite);
1570-
static const std::string source2_c = getTestFilePath("source2.c");
1570+
static const std::string source2_c = getTestFilePath("source.c");
15711571
auto projectRequest = createProjectRequest(projectName, suitePath, buildDirRelativePath, srcPaths,
15721572
GrpcUtils::UTBOT_AUTO_TARGET_PATH, false, false, 30,
15731573
ErrorMode::FAILING, false, true);

Diff for: server/test/framework/main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ int main(int argc, char **argv) {
7171
testUtils::tryExecGetBuildCommands(testUtils::getRelativeTestSuitePath("object-file"), clang,
7272
testUtils::MAKE_BUILD_COMMANDS_TOOL);
7373

74-
testUtils::tryExecGetBuildCommands(testUtils::getRelativeTestSuitePath("precompiled"), clang,
74+
testUtils::tryExecGetBuildCommands(testUtils::getRelativeTestSuitePath("linkage-ld"), clang,
7575
testUtils::MAKE_BUILD_COMMANDS_TOOL);
7676

77-
testUtils::tryExecGetBuildCommands(testUtils::getRelativeTestSuitePath("linkage-ld"), clang,
77+
testUtils::tryExecGetBuildCommands(testUtils::getRelativeTestSuitePath("precompiled"), clang,
7878
testUtils::MAKE_BUILD_COMMANDS_TOOL);
7979

8080
testUtils::tryExecGetBuildCommands(testUtils::getRelativeTestSuitePath("small-project"), gcc);

Diff for: server/test/suites/object-file/Makefile

+3-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
all: exe
44

55
clean:
6-
rm exe lib.a lib1.o lib2.o source1.o
6+
rm exe lib.a lib1.o lib2.o
77

88
lib1.o: lib1.c
99
clang -c -o lib1.o lib1.c
@@ -14,8 +14,5 @@ lib2.o: lib2.c
1414
lib.a: lib1.o lib2.o
1515
ar crs -o lib.a lib1.o lib2.o
1616

17-
source1.o: source1.c
18-
clang -c -o source1.o source1.c
19-
20-
exe: source1.o source2.c lib.a
21-
clang -o exe source1.o source2.c lib.a
17+
exe: source1.c source2.c lib.a
18+
clang -o exe source1.c source2.c lib.a

Diff for: server/test/suites/precompiled/Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
all: exe
44

55
clean:
6-
rm source2.o exe
6+
rm source.o exe
77

8-
source2.o: source2.c
9-
clang -c -o source2.o source2.c
8+
source.o: source.c
9+
clang -c -o source.o source.c
1010

11-
exe: source2.o
12-
clang -o exe ../object-file/source1.o source2.o
11+
exe: source.o
12+
clang -o exe ../linkage-ld/issue-638.o source.o

Diff for: server/test/suites/precompiled/source2.c renamed to server/test/suites/precompiled/source.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ int g() {
55
}
66

77
int main(int argc, char *argv[]) {
8-
if (f(argc) < 5) {
8+
if (abs(argc) < 5) {
99
return 0;
1010
} else {
1111
return atoi(argv[0]);

Diff for: vscode-plugin/src/config/prefs.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export class Prefs {
8989
.setUsestubs(Prefs.useStubs())
9090
.setErrormode(Prefs.errorMode())
9191
.setDifferentvariablesofthesametype(Prefs.differentVariablesOfTheSameType())
92-
.setSkipObjectWithoutSource(Prefs.SkipObjectWithoutSource);
92+
.setSkipobjectwithoutsource(Prefs.skipObjectWithoutSource);
9393
return settingsContext;
9494
}
9595

0 commit comments

Comments
 (0)