Skip to content

Commit 4bf5669

Browse files
committed
try to fix tz issue under wasm
1 parent 172c0d4 commit 4bf5669

5 files changed

Lines changed: 11 additions & 7 deletions

File tree

cpp/src/arrow/vendored/datetime/visibility.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#pragma once
1919

20-
#ifndef _WIN32
20+
#if !defined(_WIN32) && !defined(__EMSCRIPTEN__)
2121
# define USE_OS_TZDB 1
2222
#endif
2323

r/tests/testthat/test-dataset-dplyr.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ test_that("filter() with %in%", {
7070
})
7171

7272
test_that("filter() on timestamp columns", {
73-
skip_on_emscripten()
73+
# skip_on_emscripten() # TODO: remove if timezone fix (visibility.h) works
7474
skip_if_not_available("re2")
7575

7676
ds <- open_dataset(dataset_dir, partitioning = schema(part = uint8()))
@@ -120,7 +120,7 @@ test_that("filter() on date32 columns", {
120120
)
121121

122122
skip_if_not_available("re2")
123-
skip_on_emscripten()
123+
# skip_on_emscripten() # TODO: remove if timezone fix (visibility.h) works
124124

125125
# Also with timestamp scalar
126126
expect_equal(

r/tests/testthat/test-dplyr-arrange.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ test_that("Can use across() within arrange()", {
238238
collect(),
239239
example_data
240240
)
241-
skip_on_emscripten()
241+
# skip_on_emscripten() # TODO: Unrelated to timezone fix; passing a bare function (desc) to across() .fns fails on Emscripten
242242
compare_dplyr_binding(
243243
.input |>
244244
arrange(across(starts_with("d"), desc)) |>

r/tests/testthat/test-dplyr-filter.R

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ tbl <- example_data
2525
tbl$verses <- verses[[1]]
2626
# c(" a ", " b ", " c ", ...) increasing padding
2727
# nchar = 3 5 7 9 11 13 15 17 19 21
28-
tbl$padded_strings <- stringr::str_pad(letters[1:10], width = 2 * (1:10) + 1, side = "both")
28+
tbl$padded_strings <- stringr::str_pad(
29+
letters[1:10],
30+
width = 2 * (1:10) + 1,
31+
side = "both"
32+
)
2933
tbl$some_negative <- tbl$int * (-1)^(1:nrow(tbl)) # nolint
3034

3135
test_that("filter() on is.na()", {
@@ -415,7 +419,7 @@ test_that("filter() with namespaced functions", {
415419
})
416420

417421
test_that("filter() with across()", {
418-
skip_on_emscripten()
422+
# skip_on_emscripten() # TODO: Remove if timezone fix works
419423

420424
compare_dplyr_binding(
421425
.input |>

r/tests/testthat/test-dplyr-query.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ test_that("Scalars in expressions match the type of the field, if possible", {
646646
# it merges.
647647
# https://github.com/r-hub/rhub-linux-builders/pull/65
648648
skip_if(identical(Sys.timezone(), "/UTC"))
649-
skip_on_emscripten()
649+
# skip_on_emscripten() # TODO: remove if timezone fix (visibility.h) works
650650

651651
expect_output(
652652
tab |>

0 commit comments

Comments
 (0)