Skip to content

Commit 6e20a6d

Browse files
committed
[integration-tests] Specify path to the llvm bin dir instead of filecheck itself.
We can infer FileCheck's path from the llvm bin dir so there is no change today. In the future though this will enable us to use other llvm tools to "poke" at the produced snapshots for verification purposes. rdar://39456714
1 parent 79a2e45 commit 6e20a6d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

utils/build-script-impl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3483,15 +3483,15 @@ function build_and_test_installable_package() {
34833483
fi
34843484

34853485
LIT_EXECUTABLE_PATH="${LLVM_SOURCE_DIR}/utils/lit/lit.py"
3486-
FILECHECK_EXECUTABLE_PATH="$(build_directory_bin ${LOCAL_HOST} llvm)/FileCheck"
3486+
LLVM_BIN_DIR="$(build_directory_bin ${LOCAL_HOST} llvm)"
34873487
echo "-- Test Installable Package --"
34883488
call rm -rf "${PKG_TESTS_SANDBOX_PARENT}"
34893489
call mkdir -p "${PKG_TESTS_SANDBOX}"
34903490
with_pushd "${PKG_TESTS_SANDBOX_PARENT}" \
34913491
call tar xzf "${package_for_host}"
34923492

34933493
with_pushd "${PKG_TESTS_SOURCE_DIR}" \
3494-
call python "${LIT_EXECUTABLE_PATH}" . -sv --param package-path="${PKG_TESTS_SANDBOX}" --param filecheck="${FILECHECK_EXECUTABLE_PATH}" --param test-exec-root="${PKG_TESTS_TEMPS}"
3494+
call python "${LIT_EXECUTABLE_PATH}" . -sv --param package-path="${PKG_TESTS_SANDBOX}" --param test-exec-root="${PKG_TESTS_TEMPS}" --param llvm-bin-dir="${LLVM_BIN_DIR}"
34953495
fi
34963496
fi
34973497
}

0 commit comments

Comments
 (0)