From b893201e491efd84d57610a5d45c9b4259ccbb0e Mon Sep 17 00:00:00 2001
From: Scott Todd <scott.todd0@gmail.com>
Date: Thu, 1 Feb 2024 14:26:27 -0800
Subject: [PATCH] Re-enable check tests, try installing lit in job again.

---
 .github/workflows/test_package.yml             | 12 ++----------
 build_tools/cmake/iree_check_test.cmake        |  5 +----
 build_tools/pkgci/build_tests_using_package.sh |  8 +++-----
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/test_package.yml b/.github/workflows/test_package.yml
index 25d414b85831..5c40f8eaf4c8 100644
--- a/.github/workflows/test_package.yml
+++ b/.github/workflows/test_package.yml
@@ -30,16 +30,10 @@ jobs:
   linux_x86_64_cpu:
     name: Test on Linux (x86_64) CPU
     runs-on: ubuntu-22.04
-    # container: gcr.io/iree-oss/base@sha256:61e9aae211007dbad95e1f429e9e5121fd5968c204791038424979c21146cf75
     container: docker://ghcr.io/nod-ai/cpubuilder_ubuntu_jammy_ghr_x86_64:main
-    # container:
-    #   image: docker://ghcr.io/nod-ai/manylinux_x86_64:main
-    #   options: --user 1001
     steps:
       - name: "Checking out repository"
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-        # with:
-        #   submodules: true
       - name: "Marking git safe.directory"
         run: git config --global --add safe.directory '*'
       - name: "Checking out runtime submodules"
@@ -55,11 +49,9 @@ jobs:
         run: |
           mkdir iree-dist
           tar -xf "iree-dist-20240131.787-linux-x86_64.tar.xz" -C "iree-dist"
+      - name: "Installing lit"
+        run: python3 -m pip install lit
       - name: "Building tests"
-        # uses: docker://gcr.io/iree-oss/base@sha256:61e9aae211007dbad95e1f429e9e5121fd5968c204791038424979c21146cf75
-        # # uses: docker://ghcr.io/nod-ai/manylinux_x86_64:main
-        # with:
-        #   args: bash ./build_tools/pkgci/build_tests_using_package.sh iree-dist
         run: bash ./build_tools/pkgci/build_tests_using_package.sh iree-dist
       - name: "Testing package"
         run: ./build_tools/pkgci/test_package.sh
diff --git a/build_tools/cmake/iree_check_test.cmake b/build_tools/cmake/iree_check_test.cmake
index c9be539444b1..89c7c94fd736 100644
--- a/build_tools/cmake/iree_check_test.cmake
+++ b/build_tools/cmake/iree_check_test.cmake
@@ -115,10 +115,7 @@ function(iree_check_test)
   #   1. the bytecode module build to be enabled
   #   2. _RULE_DRIVER is defined and runtime support is enabled
   #   3. no other label exclusions (e.g. 'optonly' test with 'debug' config)
-  # set(_TEST_DISABLED FALSE)
-
-  # DO NOT SUBMIT - improve iteration speed by just disabling these
-  set(_TEST_DISABLED TRUE)
+  set(_TEST_DISABLED FALSE)
 
   # 1. Check bytecode module build.
   if(NOT _BYTECODE_MODULE_BUILD_ENABLED)
diff --git a/build_tools/pkgci/build_tests_using_package.sh b/build_tools/pkgci/build_tests_using_package.sh
index 558bf5f0428f..4767e07dfb6a 100755
--- a/build_tools/pkgci/build_tests_using_package.sh
+++ b/build_tools/pkgci/build_tests_using_package.sh
@@ -26,8 +26,6 @@ set -euo pipefail
 
 PACKAGE_DIR="$1"
 TEST_BUILD_DIR="${TEST_BUILD_DIR:-build-tests}"
-# LLVM_EXTERNAL_LIT="${LLVM_EXTERNAL_LIT:-$PWD/third_party/llvm-project/llvm/utils/lit/lit.py}"
-python3 -m pip install lit
 LLVM_EXTERNAL_LIT="${LLVM_EXTERNAL_LIT:-$(which lit)}"
 
 # Respect user settings, but default to turning off all GPU drivers and tests.
@@ -71,6 +69,6 @@ echo "::group::Build runtime targets"
 cmake --build ${TEST_BUILD_DIR?}
 echo "::endgroup::"
 
-# echo "::group::Build iree-test-deps"
-# cmake --build ${TEST_BUILD_DIR?} --target iree-test-deps
-# echo "::endgroup::"
+echo "::group::Build iree-test-deps"
+cmake --build ${TEST_BUILD_DIR?} --target iree-test-deps
+echo "::endgroup::"