Removes all test parts of compile.sh
So compile.sh is dedicated to bootstrapping Bazel.
It has been a long time we are not testing those code path anymore and providing a bazel binary on the command line was regularly broken
PiperOrigin-RevId: 166827487
diff --git a/compile.sh b/compile.sh
index f8af226..dc414b1 100755
--- a/compile.sh
+++ b/compile.sh
@@ -51,47 +51,15 @@
source scripts/bootstrap/buildenv.sh
-function usage() {
- [ -n "${1:-compile}" ] && echo "Invalid command(s): $1" >&2
- echo "syntax: $0 [command[,command]* [BAZEL_BIN]]" >&2
- echo " General purpose commands:" >&2
- echo " compile = compile the bazel binary (default)" >&2
- echo " Commands for developers:" >&2
- echo " all = compile,srcs,test" >&2
- echo " srcs = test that //:srcs contains all the sources" >&2
- echo " test = run the full test suite of Bazel" >&2
- exit 1
-}
-
-function parse_options() {
- local keywords="(compile|all|determinism|bootstrap|srcs|test)"
- COMMANDS="${1:-compile}"
- [[ "${COMMANDS}" =~ ^$keywords(,$keywords)*$ ]] || usage "$@"
- DO_COMPILE=
- DO_TESTS=
- DO_SRCS_TEST=
- [[ "${COMMANDS}" =~ (compile|all) ]] && DO_COMPILE=1
- [[ "${COMMANDS}" =~ (srcs|all) ]] && DO_SRCS_TEST=1
- [[ "${COMMANDS}" =~ (test|all) ]] && DO_TESTS=1
-
- BAZEL_BIN=${2:-"bazel-bin/src/bazel"}
-}
-
-parse_options "${@}"
-
mkdir -p output
-: ${BAZEL:=${2-}}
+: ${BAZEL:=}
#
# Create an initial binary so we can host ourself
#
if [ ! -x "${BAZEL}" ]; then
- display "$INFO You can skip this first step by providing a path to the bazel binary as second argument:"
- display "$INFO $0 ${COMMANDS} /path/to/bazel"
new_step 'Building Bazel from scratch'
source scripts/bootstrap/compile.sh
- # The DO_COMPILE flow will actually create the bazel binary and set BAZEL.
- DO_COMPILE=1
fi
#
@@ -110,92 +78,18 @@
source scripts/bootstrap/bootstrap.sh
-if [ $DO_COMPILE ]; then
- new_step 'Building Bazel with Bazel'
- display "."
- log "Building output/bazel"
- bazel_build "src:bazel${EXE_EXT}" \
- || fail "Could not build Bazel"
- bazel_bin_path="$(get_bazel_bin_path)/src/bazel${EXE_EXT}"
- [ -e "$bazel_bin_path" ] \
- || fail "Could not find freshly built Bazel binary at '$bazel_bin_path'"
- cp -f "$bazel_bin_path" "output/bazel${EXE_EXT}" \
- || fail "Could not copy '$bazel_bin_path' to 'output/bazel${EXE_EXT}'"
- chmod 0755 "output/bazel${EXE_EXT}"
- BAZEL="$(pwd)/output/bazel${EXE_EXT}"
-fi
-
-#
-# Test that //:srcs contains all the sources
-#
-if [ $DO_SRCS_TEST ]; then
- new_step "Checking that //:srcs contains all the sources"
- log "Querying //:srcs"
- ${BAZEL} query 'kind("source file", deps(//:srcs))' \
- | grep -v '^@' \
- | sed -e 's|^//||' | sed -e 's|^:||' | sed -e 's|:|/|' \
- | sort -u >"${OUTPUT_DIR}/srcs-query"
-
- log "Finding all files"
- # SRCS_EXCLUDES can be overriden to adds some more exceptions for the find
- # commands (for CI systems).
- SRCS_EXCLUDES=${SRCS_EXCLUDES-XXXXXXXXXXXXXX1268778dfsdf4}
- # See file BUILD for the list of grep -v exceptions.
- # tools/defaults package is hidden by Bazel so cannot be put in the srcs.
- find . -type f | sed -e 's|./||' \
- | grep -v '^bazel-' \
- | grep -v '^\.' | grep -v '^out/' | grep -v '^output/' \
- | grep -v '^derived' \
- | grep -Ev "${SRCS_EXCLUDES}" \
- | grep -v '^tools/defaults/BUILD' \
- | sort -u >"${OUTPUT_DIR}/srcs-find"
-
- log "Diffing"
- res="$(diff -U 0 "${OUTPUT_DIR}/srcs-find" "${OUTPUT_DIR}/srcs-query" | sed -e 's|^-||' | grep -Ev '^(@@|\+\+|--)' || true)"
-
- if [ -n "${res}" ]; then
- fail "//:srcs filegroup do not contains all the sources, missing:
-${res}"
- fi
-fi
-
-#
-# Tests
-#
-if [ $DO_TESTS ]; then
- new_step "Running tests"
- display "."
-
- ndk_target="$(get_bind_target //external:android_ndk_for_testing)"
- sdk_target="$(get_bind_target //external:android_sdk_for_testing)"
- if [ "$ndk_target" = "//:dummy" ] || [ "$sdk_target" = "//:dummy" ]; then
- display "$WARNING Android SDK or NDK are not set in the WORKSPACE file. Android tests will not be run."
- fi
-
- [ -n "$JAVAC_VERSION" ] || get_java_version
- if [[ ! "${BAZEL_TEST_FILTERS-}" =~ "-jdk8" ]]; then
- if [ "8" -gt ${JAVAC_VERSION#*.} ] || [ "${JAVA_VERSION}" = "1.7" ]; then
- display "$WARNING Your version of Java is lower than 1.8!"
- display "$WARNING Deactivating Java 8 tests, please use a JDK 8 to fully"
- display "$WARNING test Bazel."
- if [ -n "${BAZEL_TEST_FILTERS-}" ]; then
- BAZEL_TEST_FILTERS="${BAZEL_TEST_FILTERS},-jdk8"
- else
- BAZEL_TEST_FILTERS="-jdk8"
- fi
- fi
- fi
- $BAZEL --bazelrc=${BAZELRC} --nomaster_bazelrc \
- ${BAZEL_DIR_STARTUP_OPTIONS} \
- test \
- --test_tag_filters="${BAZEL_TEST_FILTERS-}" \
- --build_tests_only \
- --nolegacy_bazel_java_test \
- --define JAVA_VERSION=${JAVA_VERSION} \
- ${EXTRA_BAZEL_ARGS} \
- -k --test_output=errors //src/... //third_party/ijar/... //scripts/... \
- || fail "Tests failed"
-fi
+new_step 'Building Bazel with Bazel'
+display "."
+log "Building output/bazel"
+bazel_build "src:bazel${EXE_EXT}" \
+ || fail "Could not build Bazel"
+bazel_bin_path="$(get_bazel_bin_path)/src/bazel${EXE_EXT}"
+[ -e "$bazel_bin_path" ] \
+ || fail "Could not find freshly built Bazel binary at '$bazel_bin_path'"
+cp -f "$bazel_bin_path" "output/bazel${EXE_EXT}" \
+ || fail "Could not copy '$bazel_bin_path' to 'output/bazel${EXE_EXT}'"
+chmod 0755 "output/bazel${EXE_EXT}"
+BAZEL="$(pwd)/output/bazel${EXE_EXT}"
clear_log
display "Build successful! Binary is here: ${BAZEL}"
