Skip to content

Commit f93a958

Browse files
siddharthabsiddharthab
committed
Fix some tests
1 parent ee170a7 commit f93a958

13 files changed

+48
-95
lines changed

‎.github/workflows/tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88

99
jobs:
1010
test:
11+
name: Test
1112
runs-on: ${{ matrix.os }}
1213
strategy:
1314
fail-fast: false
@@ -63,5 +64,5 @@ jobs:
6364
uses: actions/upload-artifact@v4
6465
if: ${{ always() }}
6566
with:
66-
name: archive-debug-artifacts
67+
name: archive-debug-artifacts-${{ matrix.os }}-${{ matrix.bazel_version }}-${{ matrix.r_version }}
6768
path: /tmp/debug-artifacts/*

‎tests/BUILD

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ r_toolchain(
114114
toolchain(
115115
name = "toolchain-linux",
116116
exec_compatible_with = [
117-
"@bazel_tools//platforms:linux",
117+
"@platforms//os:linux",
118118
],
119119
target_compatible_with = [
120-
"@bazel_tools//platforms:linux",
120+
"@platforms//os:linux",
121121
],
122122
toolchain = ":r-toolchain-linux",
123123
toolchain_type = "@rules_r//R:toolchain_type",
@@ -127,10 +127,10 @@ toolchain(
127127
toolchain(
128128
name = "toolchain-darwin",
129129
exec_compatible_with = [
130-
"@bazel_tools//platforms:osx",
130+
"@platforms//os:osx",
131131
],
132132
target_compatible_with = [
133-
"@bazel_tools//platforms:osx",
133+
"@platforms//os:osx",
134134
],
135135
toolchain = ":r-toolchain-darwin",
136136
toolchain_type = "@rules_r//R:toolchain_type",

‎tests/coverage/all_instrumented_C.xml

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<coverage line-rate="1" branch-rate="0" lines-covered="31" lines-valid="31" branches-covered="0" branches-valid="0" complexity="0" version="3.5.1" timestamp="1960-01-01 00:00:00">
2+
<!DOCTYPE coverage SYSTEM "https://raw.githubusercontent.com/cobertura/cobertura/master/cobertura/src/site/htdocs/xml/coverage-04.dtd">
3+
<coverage line-rate="1" branch-rate="0" lines-covered="23" lines-valid="23" branches-covered="0" branches-valid="0" complexity="0" version="3.6.4" timestamp="1960-01-01 00:00:00">
34
<sources/>
45
<packages>
56
<package name="NULL" line-rate="1" branch-rate="0" complexity="0">
67
<classes>
78
<class name="fn.R" filename="external/workspaceroot/R/fn.R" line-rate="1" branch-rate="0" complexity="0">
89
<methods>
9-
<method name="hello" signature="" line-rate="1" branch-rate="0">
10+
<method name="hello" signature="" line-rate="1" branch-rate="0" complexity="0">
1011
<lines>
1112
<line number="16" hits="1" branch="false"/>
1213
</lines>
1314
</method>
14-
<method name="helloC" signature="" line-rate="1" branch-rate="0">
15+
<method name="helloC" signature="" line-rate="1" branch-rate="0" complexity="0">
1516
<lines>
1617
<line number="20" hits="1" branch="false"/>
1718
</lines>
@@ -30,7 +31,7 @@
3031
</class>
3132
<class name="fn.R" filename="packages/exampleA/R/fn.R" line-rate="1" branch-rate="0" complexity="0">
3233
<methods>
33-
<method name="exampleA" signature="" line-rate="1" branch-rate="0">
34+
<method name="exampleA" signature="" line-rate="1" branch-rate="0" complexity="0">
3435
<lines>
3536
<line number="16" hits="2" branch="false"/>
3637
</lines>
@@ -42,7 +43,7 @@
4243
</class>
4344
<class name="fn.R" filename="packages/exampleB/R/fn.R" line-rate="1" branch-rate="0" complexity="0">
4445
<methods>
45-
<method name="exampleB" signature="" line-rate="1" branch-rate="0">
46+
<method name="exampleB" signature="" line-rate="1" branch-rate="0" complexity="0">
4647
<lines>
4748
<line number="16" hits="2" branch="false"/>
4849
</lines>
@@ -54,7 +55,7 @@
5455
</class>
5556
<class name="fn.R" filename="packages/exampleC/R/fn.R" line-rate="1" branch-rate="0" complexity="0">
5657
<methods>
57-
<method name="exampleC" signature="" line-rate="1" branch-rate="0">
58+
<method name="exampleC" signature="" line-rate="1" branch-rate="0" complexity="0">
5859
<lines>
5960
<line number="16" hits="1" branch="false"/>
6061
</lines>
@@ -66,12 +67,12 @@
6667
</class>
6768
<class name="rcpp.R" filename="packages/exampleC/R/rcpp.R" line-rate="1" branch-rate="0" complexity="0">
6869
<methods>
69-
<method name="rcppHello" signature="" line-rate="1" branch-rate="0">
70+
<method name="rcppHello" signature="" line-rate="1" branch-rate="0" complexity="0">
7071
<lines>
7172
<line number="16" hits="2" branch="false"/>
7273
</lines>
7374
</method>
74-
<method name="rcppHelloWrapped" signature="" line-rate="1" branch-rate="0">
75+
<method name="rcppHelloWrapped" signature="" line-rate="1" branch-rate="0" complexity="0">
7576
<lines>
7677
<line number="20" hits="2" branch="false"/>
7778
</lines>
@@ -106,24 +107,6 @@
106107
<line number="19" hits="1" branch="false"/>
107108
</lines>
108109
</class>
109-
<class name="getCharacter.c" filename="packages/exampleC/src/lib/getCharacter.c" line-rate="1" branch-rate="0" complexity="0">
110-
<methods/>
111-
<lines>
112-
<line number="17" hits="1" branch="false"/>
113-
</lines>
114-
</class>
115-
<class name="rcpp.cc" filename="packages/exampleC/src/lib/rcpp.cc" line-rate="1" branch-rate="0" complexity="0">
116-
<methods/>
117-
<lines>
118-
<line number="20" hits="4" branch="false"/>
119-
<line number="21" hits="4" branch="false"/>
120-
<line number="28" hits="4" branch="false"/>
121-
<line number="33" hits="2" branch="false"/>
122-
<line number="40" hits="2" branch="false"/>
123-
<line number="41" hits="2" branch="false"/>
124-
<line number="42" hits="2" branch="false"/>
125-
</lines>
126-
</class>
127110
<class name="rcpp.cc" filename="packages/exampleC/src/rcpp.cc" line-rate="1" branch-rate="0" complexity="0">
128111
<methods/>
129112
<lines>

‎tests/coverage/all_instrumented_D.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<coverage line-rate="1" branch-rate="0" lines-covered="4" lines-valid="4" branches-covered="0" branches-valid="0" complexity="0" version="3.5.1" timestamp="1960-01-01 00:00:00">
2+
<!DOCTYPE coverage SYSTEM "https://raw.githubusercontent.com/cobertura/cobertura/master/cobertura/src/site/htdocs/xml/coverage-04.dtd">
3+
<coverage line-rate="1" branch-rate="0" lines-covered="4" lines-valid="4" branches-covered="0" branches-valid="0" complexity="0" version="3.6.4" timestamp="1960-01-01 00:00:00">
34
<sources/>
45
<packages>
56
<package name="NULL" line-rate="1" branch-rate="0" complexity="0">
67
<classes>
78
<class name="proto.R" filename="packages/exampleD/R/proto.R" line-rate="1" branch-rate="0" complexity="0">
89
<methods>
9-
<method name="proto" signature="" line-rate="1" branch-rate="0">
10+
<method name="proto" signature="" line-rate="1" branch-rate="0" complexity="0">
1011
<lines>
1112
<line number="16" hits="1" branch="false"/>
1213
<line number="17" hits="1" branch="false"/>

‎tests/coverage/coverage_test.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ echo "=== Testing custom toolchain ==="
112112
echo "Checking coverage results with the LLVM toolchain:"
113113
toolchain_args=(
114114
"--extra_toolchains=//:toolchain-${os}"
115-
"--extra_toolchains=@llvm_toolchain//:cc-toolchain-x86_64-${os}"
116-
"--incompatible_enable_cc_toolchain_resolution"
115+
"--extra_toolchains=@llvm_toolchain//:cc-toolchain-aarch64-${os}"
117116
"--toolchain_resolution_debug=rules_r"
118117
)
119118
"${bazel}" coverage "${bazel_test_opts[@]}" "${toolchain_args[@]}" //...

‎tests/coverage/custom_toolchain_C.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<coverage line-rate="1" branch-rate="0" lines-covered="19" lines-valid="19" branches-covered="0" branches-valid="0" complexity="0" version="3.5.1" timestamp="1960-01-01 00:00:00">
2+
<!DOCTYPE coverage SYSTEM "https://raw.githubusercontent.com/cobertura/cobertura/master/cobertura/src/site/htdocs/xml/coverage-04.dtd">
3+
<coverage line-rate="1" branch-rate="0" lines-covered="19" lines-valid="19" branches-covered="0" branches-valid="0" complexity="0" version="3.6.4" timestamp="1960-01-01 00:00:00">
34
<sources/>
45
<packages>
56
<package name="NULL" line-rate="1" branch-rate="0" complexity="0">
67
<classes>
78
<class name="fn.R" filename="packages/exampleC/R/fn.R" line-rate="1" branch-rate="0" complexity="0">
89
<methods>
9-
<method name="exampleC" signature="" line-rate="1" branch-rate="0">
10+
<method name="exampleC" signature="" line-rate="1" branch-rate="0" complexity="0">
1011
<lines>
1112
<line number="16" hits="1" branch="false"/>
1213
</lines>
@@ -18,12 +19,12 @@
1819
</class>
1920
<class name="rcpp.R" filename="packages/exampleC/R/rcpp.R" line-rate="1" branch-rate="0" complexity="0">
2021
<methods>
21-
<method name="rcppHello" signature="" line-rate="1" branch-rate="0">
22+
<method name="rcppHello" signature="" line-rate="1" branch-rate="0" complexity="0">
2223
<lines>
2324
<line number="16" hits="2" branch="false"/>
2425
</lines>
2526
</method>
26-
<method name="rcppHelloWrapped" signature="" line-rate="1" branch-rate="0">
27+
<method name="rcppHelloWrapped" signature="" line-rate="1" branch-rate="0" complexity="0">
2728
<lines>
2829
<line number="20" hits="2" branch="false"/>
2930
</lines>

‎tests/coverage/custom_toolchain_D.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<coverage line-rate="1" branch-rate="0" lines-covered="4" lines-valid="4" branches-covered="0" branches-valid="0" complexity="0" version="3.5.1" timestamp="1960-01-01 00:00:00">
2+
<!DOCTYPE coverage SYSTEM "https://raw.githubusercontent.com/cobertura/cobertura/master/cobertura/src/site/htdocs/xml/coverage-04.dtd">
3+
<coverage line-rate="1" branch-rate="0" lines-covered="4" lines-valid="4" branches-covered="0" branches-valid="0" complexity="0" version="3.6.4" timestamp="1960-01-01 00:00:00">
34
<sources/>
45
<packages>
56
<package name="NULL" line-rate="1" branch-rate="0" complexity="0">
67
<classes>
78
<class name="proto.R" filename="packages/exampleD/R/proto.R" line-rate="1" branch-rate="0" complexity="0">
89
<methods>
9-
<method name="proto" signature="" line-rate="1" branch-rate="0">
10+
<method name="proto" signature="" line-rate="1" branch-rate="0" complexity="0">
1011
<lines>
1112
<line number="16" hits="1" branch="false"/>
1213
<line number="17" hits="1" branch="false"/>

‎tests/coverage/default_instrumented.xml

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<coverage line-rate="1" branch-rate="0" lines-covered="26" lines-valid="26" branches-covered="0" branches-valid="0" complexity="0" version="3.5.1" timestamp="1960-01-01 00:00:00">
2+
<!DOCTYPE coverage SYSTEM "https://raw.githubusercontent.com/cobertura/cobertura/master/cobertura/src/site/htdocs/xml/coverage-04.dtd">
3+
<coverage line-rate="1" branch-rate="0" lines-covered="18" lines-valid="18" branches-covered="0" branches-valid="0" complexity="0" version="3.6.4" timestamp="1960-01-01 00:00:00">
34
<sources/>
45
<packages>
56
<package name="NULL" line-rate="1" branch-rate="0" complexity="0">
67
<classes>
78
<class name="fn.R" filename="packages/exampleC/R/fn.R" line-rate="1" branch-rate="0" complexity="0">
89
<methods>
9-
<method name="exampleC" signature="" line-rate="1" branch-rate="0">
10+
<method name="exampleC" signature="" line-rate="1" branch-rate="0" complexity="0">
1011
<lines>
1112
<line number="16" hits="1" branch="false"/>
1213
</lines>
@@ -18,12 +19,12 @@
1819
</class>
1920
<class name="rcpp.R" filename="packages/exampleC/R/rcpp.R" line-rate="1" branch-rate="0" complexity="0">
2021
<methods>
21-
<method name="rcppHello" signature="" line-rate="1" branch-rate="0">
22+
<method name="rcppHello" signature="" line-rate="1" branch-rate="0" complexity="0">
2223
<lines>
2324
<line number="16" hits="2" branch="false"/>
2425
</lines>
2526
</method>
26-
<method name="rcppHelloWrapped" signature="" line-rate="1" branch-rate="0">
27+
<method name="rcppHelloWrapped" signature="" line-rate="1" branch-rate="0" complexity="0">
2728
<lines>
2829
<line number="20" hits="2" branch="false"/>
2930
</lines>
@@ -58,24 +59,6 @@
5859
<line number="19" hits="1" branch="false"/>
5960
</lines>
6061
</class>
61-
<class name="getCharacter.c" filename="packages/exampleC/src/lib/getCharacter.c" line-rate="1" branch-rate="0" complexity="0">
62-
<methods/>
63-
<lines>
64-
<line number="17" hits="1" branch="false"/>
65-
</lines>
66-
</class>
67-
<class name="rcpp.cc" filename="packages/exampleC/src/lib/rcpp.cc" line-rate="1" branch-rate="0" complexity="0">
68-
<methods/>
69-
<lines>
70-
<line number="20" hits="4" branch="false"/>
71-
<line number="21" hits="4" branch="false"/>
72-
<line number="28" hits="4" branch="false"/>
73-
<line number="33" hits="2" branch="false"/>
74-
<line number="40" hits="2" branch="false"/>
75-
<line number="41" hits="2" branch="false"/>
76-
<line number="42" hits="2" branch="false"/>
77-
</lines>
78-
</class>
7962
<class name="rcpp.cc" filename="packages/exampleC/src/rcpp.cc" line-rate="1" branch-rate="0" complexity="0">
8063
<methods/>
8164
<lines>

‎tests/coverage/workspace_instrumented_C.xml

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<coverage line-rate="1" branch-rate="0" lines-covered="28" lines-valid="28" branches-covered="0" branches-valid="0" complexity="0" version="3.5.1" timestamp="1960-01-01 00:00:00">
2+
<!DOCTYPE coverage SYSTEM "https://raw.githubusercontent.com/cobertura/cobertura/master/cobertura/src/site/htdocs/xml/coverage-04.dtd">
3+
<coverage line-rate="1" branch-rate="0" lines-covered="20" lines-valid="20" branches-covered="0" branches-valid="0" complexity="0" version="3.6.4" timestamp="1960-01-01 00:00:00">
34
<sources/>
45
<packages>
56
<package name="NULL" line-rate="1" branch-rate="0" complexity="0">
67
<classes>
78
<class name="fn.R" filename="packages/exampleA/R/fn.R" line-rate="1" branch-rate="0" complexity="0">
89
<methods>
9-
<method name="exampleA" signature="" line-rate="1" branch-rate="0">
10+
<method name="exampleA" signature="" line-rate="1" branch-rate="0" complexity="0">
1011
<lines>
1112
<line number="16" hits="2" branch="false"/>
1213
</lines>
@@ -18,7 +19,7 @@
1819
</class>
1920
<class name="fn.R" filename="packages/exampleB/R/fn.R" line-rate="1" branch-rate="0" complexity="0">
2021
<methods>
21-
<method name="exampleB" signature="" line-rate="1" branch-rate="0">
22+
<method name="exampleB" signature="" line-rate="1" branch-rate="0" complexity="0">
2223
<lines>
2324
<line number="16" hits="2" branch="false"/>
2425
</lines>
@@ -30,7 +31,7 @@
3031
</class>
3132
<class name="fn.R" filename="packages/exampleC/R/fn.R" line-rate="1" branch-rate="0" complexity="0">
3233
<methods>
33-
<method name="exampleC" signature="" line-rate="1" branch-rate="0">
34+
<method name="exampleC" signature="" line-rate="1" branch-rate="0" complexity="0">
3435
<lines>
3536
<line number="16" hits="1" branch="false"/>
3637
</lines>
@@ -42,12 +43,12 @@
4243
</class>
4344
<class name="rcpp.R" filename="packages/exampleC/R/rcpp.R" line-rate="1" branch-rate="0" complexity="0">
4445
<methods>
45-
<method name="rcppHello" signature="" line-rate="1" branch-rate="0">
46+
<method name="rcppHello" signature="" line-rate="1" branch-rate="0" complexity="0">
4647
<lines>
4748
<line number="16" hits="2" branch="false"/>
4849
</lines>
4950
</method>
50-
<method name="rcppHelloWrapped" signature="" line-rate="1" branch-rate="0">
51+
<method name="rcppHelloWrapped" signature="" line-rate="1" branch-rate="0" complexity="0">
5152
<lines>
5253
<line number="20" hits="2" branch="false"/>
5354
</lines>
@@ -82,24 +83,6 @@
8283
<line number="19" hits="1" branch="false"/>
8384
</lines>
8485
</class>
85-
<class name="getCharacter.c" filename="packages/exampleC/src/lib/getCharacter.c" line-rate="1" branch-rate="0" complexity="0">
86-
<methods/>
87-
<lines>
88-
<line number="17" hits="1" branch="false"/>
89-
</lines>
90-
</class>
91-
<class name="rcpp.cc" filename="packages/exampleC/src/lib/rcpp.cc" line-rate="1" branch-rate="0" complexity="0">
92-
<methods/>
93-
<lines>
94-
<line number="20" hits="4" branch="false"/>
95-
<line number="21" hits="4" branch="false"/>
96-
<line number="28" hits="4" branch="false"/>
97-
<line number="33" hits="2" branch="false"/>
98-
<line number="40" hits="2" branch="false"/>
99-
<line number="41" hits="2" branch="false"/>
100-
<line number="42" hits="2" branch="false"/>
101-
</lines>
102-
</class>
10386
<class name="rcpp.cc" filename="packages/exampleC/src/rcpp.cc" line-rate="1" branch-rate="0" complexity="0">
10487
<methods/>
10588
<lines>

‎tests/coverage/workspace_instrumented_D.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<coverage line-rate="1" branch-rate="0" lines-covered="4" lines-valid="4" branches-covered="0" branches-valid="0" complexity="0" version="3.5.1" timestamp="1960-01-01 00:00:00">
2+
<!DOCTYPE coverage SYSTEM "https://raw.githubusercontent.com/cobertura/cobertura/master/cobertura/src/site/htdocs/xml/coverage-04.dtd">
3+
<coverage line-rate="1" branch-rate="0" lines-covered="4" lines-valid="4" branches-covered="0" branches-valid="0" complexity="0" version="3.6.4" timestamp="1960-01-01 00:00:00">
34
<sources/>
45
<packages>
56
<package name="NULL" line-rate="1" branch-rate="0" complexity="0">
67
<classes>
78
<class name="proto.R" filename="packages/exampleD/R/proto.R" line-rate="1" branch-rate="0" complexity="0">
89
<methods>
9-
<method name="proto" signature="" line-rate="1" branch-rate="0">
10+
<method name="proto" signature="" line-rate="1" branch-rate="0" complexity="0">
1011
<lines>
1112
<line number="16" hits="1" branch="false"/>
1213
<line number="17" hits="1" branch="false"/>

‎tests/coverage/workspaceroot.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<coverage line-rate="1" branch-rate="0" lines-covered="3" lines-valid="3" branches-covered="0" branches-valid="0" complexity="0" version="3.5.1" timestamp="1960-01-01 00:00:00">
2+
<!DOCTYPE coverage SYSTEM "https://raw.githubusercontent.com/cobertura/cobertura/master/cobertura/src/site/htdocs/xml/coverage-04.dtd">
3+
<coverage line-rate="1" branch-rate="0" lines-covered="3" lines-valid="3" branches-covered="0" branches-valid="0" complexity="0" version="3.6.4" timestamp="1960-01-01 00:00:00">
34
<sources/>
45
<packages>
56
<package name="NULL" line-rate="1" branch-rate="0" complexity="0">
67
<classes>
78
<class name="fn.R" filename="external/workspaceroot/R/fn.R" line-rate="1" branch-rate="0" complexity="0">
89
<methods>
9-
<method name="hello" signature="" line-rate="1" branch-rate="0">
10+
<method name="hello" signature="" line-rate="1" branch-rate="0" complexity="0">
1011
<lines>
1112
<line number="16" hits="1" branch="false"/>
1213
</lines>
1314
</method>
14-
<method name="helloC" signature="" line-rate="1" branch-rate="0">
15+
<method name="helloC" signature="" line-rate="1" branch-rate="0" complexity="0">
1516
<lines>
1617
<line number="20" hits="1" branch="false"/>
1718
</lines>

‎tests/cran/Makevars.gnu

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,7 @@ CPPFLAGS += "-Wno-builtin-macro-redefined" \
4646
"-ffile-prefix-map=_EXEC_ROOT_=" \
4747
"-no-canonical-prefixes" \
4848

49+
LDFLAGS += -fuse-ld=lld
50+
4951
# Following flags should be enabled if switching to gcc:
5052
# CPPFLAGS += -fno-canonical-system-headers

0 commit comments

Comments
 (0)