extendrtests: color makes the log files tainted. auto seems

to retain the color in rstudio, and also the log-files aren't tainted with terminal codes
CGMossa · Feb 9, 2024 · d8389c3 · d8389c3
1 parent 5163b75
commit d8389c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/extendrtests/src/Makevars b/tests/extendrtests/src/Makevars
@@ -8,7 +8,7 @@ all: C_clean
 $(SHLIB): $(STATLIB)
 
 $(STATLIB):
-	cargo build --lib --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR) --color=always
+	cargo build --lib --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR) --color=auto
 
 C_clean:
 	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS)

diff --git a/tests/extendrtests/src/Makevars.win b/tests/extendrtests/src/Makevars.win
@@ -24,7 +24,7 @@ $(STATLIB):
 	# CARGO_LINKER is provided in Makevars.ucrt for R >= 4.2
 	export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="$(CARGO_LINKER)" && \
 		export LIBRARY_PATH="$${LIBRARY_PATH};$(CURDIR)/$(TARGET_DIR)/libgcc_mock" && \
-		cargo build --target=$(TARGET) --lib --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR) --color=always
+		cargo build --target=$(TARGET) --lib --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR) --color=auto
 
 C_clean:
 	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS)