Pass bin dir to build_tests_using_package for easier substitutions.

ScottTodd · Jul 24, 2024 · 40329ff · 40329ff
1 parent d8bf4ac
commit 40329ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -128,7 +128,7 @@ jobs:
               --env IREE_CUDA_DISABLE \
               --env IREE_HIP_DISABLE \
               gcr.io/iree-oss/nvidia@sha256:433e072f075f90fdf07471673626b17091d8d8e2395626f1e6ac6c98803c8807 \
-              ./build_tools/pkgci/build_tests_using_package.sh ${INSTALL_DIR}
+              ./build_tools/pkgci/build_tests_using_package.sh ${INSTALL_DIR}/bin
       - name: "Running GPU tests"
         env:
           IREE_CTEST_LABEL_REGEX: ^requires-gpu|^driver=vulkan$|^driver=cuda$
@@ -193,7 +193,7 @@ jobs:
   #             --env IREE_CUDA_DISABLE \
   #             --env IREE_HIP_DISABLE \
   #             gcr.io/iree-oss/nvidia@sha256:433e072f075f90fdf07471673626b17091d8d8e2395626f1e6ac6c98803c8807 \
-  #             ./build_tools/pkgci/build_tests_using_package.sh ${INSTALL_DIR}
+  #             ./build_tools/pkgci/build_tests_using_package.sh ${INSTALL_DIR}/bin
   #     - name: "Running GPU tests"
   #       env:
   #         IREE_CTEST_LABEL_REGEX: ^requires-gpu-sm80|^requires-gpu|^driver=vulkan$|^driver=cuda$
@@ -243,7 +243,7 @@ jobs:
         run: tar -xf "${INSTALL_DIR_ARCHIVE}"
       - name: "Building tests"
         run: |
-          ./build_tools/pkgci/build_tests_using_package.sh ${INSTALL_DIR}
+          ./build_tools/pkgci/build_tests_using_package.sh ${INSTALL_DIR}/bin
       - name: "Running GPU tests"
         env:
           IREE_CTEST_LABEL_REGEX: ^requires-gpu|^driver=hip$
@@ -287,7 +287,7 @@ jobs:
         run: tar -xf "${INSTALL_DIR_ARCHIVE}"
       - name: "Building tests"
         run: |
-          ./build_tools/pkgci/build_tests_using_package.sh ${INSTALL_DIR}
+          ./build_tools/pkgci/build_tests_using_package.sh ${INSTALL_DIR}/bin
       - name: "Running GPU tests"
         env:
           IREE_CTEST_LABEL_REGEX: ^requires-gpu|^driver=hip$
@@ -326,7 +326,7 @@ jobs:
         run: tar -xf "${INSTALL_DIR_ARCHIVE}"
       - name: "Building tests"
         run: |
-          ./build_tools/pkgci/build_tests_using_package.sh ${INSTALL_DIR}
+          ./build_tools/pkgci/build_tests_using_package.sh ${INSTALL_DIR}/bin
       - name: "Running GPU tests"
         env:
           CTEST_PARALLEL_LEVEL: 1

diff --git a/build_tools/pkgci/build_tests_using_package.sh b/build_tools/pkgci/build_tests_using_package.sh
@@ -27,7 +27,7 @@
 set -xeuo pipefail
 
 
-PACKAGE_DIR="$1"
+BINARY_DIR="$1"
 BUILD_DIR="${BUILD_DIR:-build-tests}"
 
 source build_tools/scripts/install_lit.sh
@@ -76,7 +76,7 @@ cmake_args=(
   "-DIREE_BUILD_PYTHON_BINDINGS=OFF"
   "-DIREE_BUILD_COMPILER=OFF"
   "-DIREE_BUILD_ALL_CHECK_TEST_MODULES=OFF"
-  "-DIREE_HOST_BIN_DIR=${PACKAGE_DIR?}/bin"
+  "-DIREE_HOST_BIN_DIR=${BINARY_DIR?}"
   "-DLLVM_EXTERNAL_LIT=${LLVM_EXTERNAL_LIT?}"
 )
 cmake_args+=(${cmake_config_options[@]})