From d8389c309ca503755604f89c67b263dbbdf53360 Mon Sep 17 00:00:00 2001 From: cgmossa Date: Sun, 4 Feb 2024 21:47:02 +0100 Subject: [PATCH] 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 --- tests/extendrtests/src/Makevars | 2 +- tests/extendrtests/src/Makevars.win | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/extendrtests/src/Makevars b/tests/extendrtests/src/Makevars index 645d29af88..15d20edeff 100644 --- 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 index 88e191a439..580d78022f 100644 --- 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)