From 60db2a03640a2b81ca6e5d417e9060d1dca86fea Mon Sep 17 00:00:00 2001 From: Scott Todd Date: Thu, 1 Feb 2024 12:03:02 -0800 Subject: [PATCH] Docker env vars ugh. --- .github/workflows/test_package.yml | 1 - build_tools/pkgci/test_package.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test_package.yml b/.github/workflows/test_package.yml index 562a5363c97b..25ea751a0fda 100644 --- a/.github/workflows/test_package.yml +++ b/.github/workflows/test_package.yml @@ -49,6 +49,5 @@ jobs: - name: "Testing package" run: | ./build_tools/github_actions/docker_run.sh \ - --env LLVM_EXTERNAL_LIT=$PWD/third_party/llvm-project/llvm/utils/lit/lit.py \ gcr.io/iree-oss/base@sha256:61e9aae211007dbad95e1f429e9e5121fd5968c204791038424979c21146cf75 \ ./build_tools/pkgci/test_package.sh iree-dist diff --git a/build_tools/pkgci/test_package.sh b/build_tools/pkgci/test_package.sh index be24411acfa5..6314359efb00 100755 --- a/build_tools/pkgci/test_package.sh +++ b/build_tools/pkgci/test_package.sh @@ -31,7 +31,7 @@ set -x PACKAGE_DIR="$1" SOURCE_DIR_ROOT=$(git rev-parse --show-toplevel) TEST_BUILD_DIR="${TEST_BUILD_DIR:-build-tests}" -LLVM_EXTERNAL_LIT="${LLVM_EXTERNAL_LIT:-$(which lit)}" +LLVM_EXTERNAL_LIT="${LLVM_EXTERNAL_LIT:-${SOURCE_DIR_ROOT}/third_party/llvm-project/llvm/utils/lit/lit.py}" # Respect user settings, but default to as many test actions as we have cores. get_default_parallel_level() {