Skip to content

Commit 278d9b1

Browse files
committed
Fix integration tests
1 parent 016d200 commit 278d9b1

File tree

5 files changed

+15
-21
lines changed

5 files changed

+15
-21
lines changed

csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/Assemblies.ql

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ private string getPath(Assembly a) {
44
not a.getCompilation().getOutputAssembly() = a and
55
exists(string s | s = a.getFile().getAbsolutePath() |
66
result =
7-
s.substring(s.indexOf("GitHub/packages/") + "GitHub/packages/".length() + 16, s.length())
7+
s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
8+
"/packages".length(), s.length())
89
or
910
result = s and
10-
not exists(s.indexOf("GitHub/packages/"))
11+
not exists(s.indexOf("test-db/working/"))
1112
)
1213
}
1314

csharp/ql/integration-tests/posix-only/standalone_dependencies/Assemblies.ql

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ private string getPath(Assembly a) {
44
not a.getCompilation().getOutputAssembly() = a and
55
exists(string s | s = a.getFile().getAbsolutePath() |
66
result =
7-
s.substring(s.indexOf("GitHub/packages/") + "GitHub/packages/".length() + 16, s.length())
7+
s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
8+
"/packages".length(), s.length())
89
or
910
result = s and
10-
not exists(s.indexOf("GitHub/packages/"))
11+
not exists(s.indexOf("test-db/working/"))
1112
)
1213
}
1314

csharp/ql/integration-tests/posix-only/standalone_dependencies_multi_target/Assemblies.ql

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ private string getPath(Assembly a) {
44
not a.getCompilation().getOutputAssembly() = a and
55
exists(string s | s = a.getFile().getAbsolutePath() |
66
result =
7-
s.substring(s.indexOf("GitHub/packages/") + "GitHub/packages/".length() + 16, s.length())
7+
s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
8+
"/packages".length(), s.length())
89
or
910
result = s and
10-
not exists(s.indexOf("GitHub/packages/"))
11+
not exists(s.indexOf("test-db/working/"))
1112
)
1213
}
1314

csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget/Assemblies.ql

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,9 @@ private string getPath(Assembly a) {
44
not a.getCompilation().getOutputAssembly() = a and
55
exists(string s | s = a.getFile().getAbsolutePath() |
66
result =
7-
s.substring(s.indexOf("GitHub/packages/") + "GitHub/packages/".length() + 16, s.length())
8-
or
9-
result =
10-
s.substring(s.indexOf("GitHub/legacypackages/") + "GitHub/legacypackages/".length() + 16,
11-
s.length())
12-
// TODO: excluding all other assemblies from the test result as mono installations seem problematic on ARM runners.
13-
// or
14-
// result = s.substring(s.indexOf("lib/mono/") + "lib/mono/".length(), s.length())
15-
// or
16-
// result = s and
17-
// not exists(s.indexOf("GitHub/packages/")) and
18-
// not exists(s.indexOf("GitHub/legacypackages/")) and
19-
// not exists(s.indexOf("lib/mono/"))
7+
s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
8+
"/legacypackages".length(), s.length())
9+
// TODO: include all other assemblies from the test results. Initially disable because mono installations were problematic on ARM runners.
2010
)
2111
}
2212

csharp/ql/integration-tests/windows-only/standalone_dependencies/Assemblies.ql

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ private string getPath(Assembly a) {
44
not a.getCompilation().getOutputAssembly() = a and
55
exists(string s | s = a.getFile().getAbsolutePath() |
66
result =
7-
s.substring(s.indexOf("GitHub/packages/") + "GitHub/packages/".length() + 16, s.length())
7+
s.substring(s.indexOf("test-db/working/") + "test-db/working/".length() + 16 +
8+
"/packages".length(), s.length())
89
or
910
result = s and
10-
not exists(s.indexOf("GitHub/packages/"))
11+
not exists(s.indexOf("test-db/working/"))
1112
)
1213
}
1314

0 commit comments

Comments
 (0)