Merge pull request #19018 from github/redsun82/rust-ql-test-log-fix

Rust: fix `qltest.sh` for some versions of macOS

rust/tools/qltest.sh

@@ -4,19 +4,18 @@ set -eu
 set -o pipefail
 
 export RUST_BACKTRACE=full
-QLTEST_LOG="$CODEQL_EXTRACTOR_RUST_LOG_DIR"/qltest.log
-mkdir -p "$CODEQL_EXTRACTOR_RUST_SCRATCH_DIR"
-TMP_OUT="$(mktemp --tmpdir="$CODEQL_EXTRACTOR_RUST_SCRATCH_DIR" qltest-XXXXXX.log))"
-trap 'rm -f "$TMP_OUT"' EXIT
+QLTEST_LOG="$CODEQL_EXTRACTOR_RUST_LOG_DIR/qltest.log"
+QLTEST_COLORED_LOG="$CODEQL_EXTRACTOR_RUST_SCRATCH_DIR/qltest.log"
+dirname "$QLTEST_LOG" "$QLTEST_COLORED_LOG" | xargs mkdir -p
 # put full-color output on the side, but remove the color codes from the log file
 # also, print (colored) output only in case of failure
 if ! "$CODEQL_EXTRACTOR_RUST_ROOT/tools/$CODEQL_PLATFORM/extractor" \
      --qltest \
      --logging-verbosity=progress+ \
      2>&1 \
-     | tee "$TMP_OUT" \
+     | tee "$QLTEST_COLORED_LOG" \
      | sed 's/\x1B\[[0-9;]\{1,\}[A-Za-z]//g' \
      > "$QLTEST_LOG"; then
-  cat "$TMP_OUT"
+  cat "$QLTEST_COLORED_LOG"
   exit 1
 fi