revert the intentional failure

jonkeane · jonkeane · commit 5812a194c3d9 · 2021-05-04T17:39:54.000-05:00
diff --git a/ci/scripts/r_valgrind.sh b/ci/scripts/r_valgrind.sh
@@ -34,6 +34,7 @@ ${R_BIN} --vanilla -d "valgrind --tool=memcheck --leak-check=full --track-origin
 # but R eats that and returns 0, so we need to look at the output and make sure that
 # we have 0 errors instead.
 if [ $(grep -c "ERROR SUMMARY: 0 errors" testthat.out) != 1 ]; then
+  cat testthat.out
   echo "Found Valgrind errors"
   exit 1
 fi
diff --git a/r/tests/testthat/helper-skip.R b/r/tests/testthat/helper-skip.R
@@ -60,12 +60,12 @@ skip_on_valgrind <- function() {
   # This does not actually skip on valgrind because we can't exactly detect it.
   # Instead, it skips on CRAN when the OS is linux + and the R version is development 
   # (which is where valgrind is run as of this code)
-  # linux_dev <- identical(tolower(Sys.info()[["sysname"]]), "linux") &&
-  #   grepl("devel", R.version.string)
+  linux_dev <- identical(tolower(Sys.info()[["sysname"]]), "linux") &&
+    grepl("devel", R.version.string)
 
-  # if (linux_dev) {
-  #   skip_on_cran()
-  # }
+  if (linux_dev) {
+    skip_on_cran()
+  }
 }
 
 process_is_running <- function(x) {
